From 64b686ae6e90b573d36d2bc10a8b556e84499b63 Mon Sep 17 00:00:00 2001
From: mengkuiliang <1464081137@qq.com>
Date: Tue, 24 Oct 2023 09:45:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nurseapplogin/impl/NurseAppLoginServiceImpl.java       | 7 ++++---
 .../mapper/applet/nurseapplogin/NurseAppLoginMapper.xml    | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
index 68ea7a2..ce31aa7 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
@@ -195,6 +195,9 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
         } else {
             patientDisease.setAreaName("");
         }
+        // 更新签约编号
+        setSignInfo(patientDisease);
+
         //查询所有商品订单
         List<GoodsOrder> goodsOrders = nurseAppLoginMapper.selectGoodsOrderListByPatient(patientId);
         if (CollectionUtils.isEmpty(goodsOrders)) {
@@ -209,8 +212,6 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
         patientDisease.setWaitReceivedGoodsCount(waitReceivedGoodsCount);
         patientDisease.setReceivedGoodsCount(receivedGoodsCount);
         patientDisease.setEvaluatedCount(evaluatedCount);
-        // 更新签约编号
-        setSignInfo(patientDisease);
         return AjaxResult.success(patientDisease);
     }
 
@@ -220,7 +221,7 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
             try {
                 String result = (String) httpService.get(SpringUtils.getFdUrl(patientDisease.getCityCode()) + "/resident/signinfo/detail/" + patientDisease.getCardNo(), null, String.class);
                 JSONObject jsonObject = JSONObject.parseObject(result);
-                if ("1".equals(jsonObject.get("code"))) {
+                if (jsonObject.getInteger("code") == 1) {
                     String signNo = "";
                     if (jsonObject.getJSONObject("data") != null) {
                         JSONObject signInfo = jsonObject.getJSONObject("data");
diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml
index be1aaa4..02b1f68 100644
--- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml
+++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml
@@ -26,6 +26,7 @@
         <result property="patientCode" column="patient_code"/>
         <result property="disease" column="disease"/>
         <result property="signNo" column="sign_no"/>
+        <result property="cityCode" column="city_code"/>
         <collection property="patientDiseaseInfoList" javaType="java.util.List" resultMap="PatientDiseaseInfoResult"/>
     </resultMap>