住院问卷添加出院病区

src/main/java/thyyxxk/wxservice_server/dao/AssessmentDao.java

@@ -31,11 +31,13 @@ public interface AssessmentDao {
             "where patient_id=#{patNo} order by visit_date desc")
     String selectLastVisitDept(String patNo);
 
-    @Select("select rtrim(isnull(zk_ward,dis_dept)) from zy_inactpatient where inpatient_no=#{patNo} and admiss_times=#{times}")
-    String getDismissDept(String patNo, int times);
+    @Select("select dept=rtrim(isnull(zk_ward,dis_dept)),ward=rtrim(isnull(dis_ward,ward)) " +
+            "from zy_inactpatient where inpatient_no=#{patNo} and admiss_times=#{times}")
+    WardDept getDismissDept(String patNo, int times);
 
-    @Select("select rtrim(zk_ward) from zy_actpatient where inpatient_no=#{patNo} and admiss_times=#{times}")
-    String getDismissDept2(String patNo, int times);
+    @Select("select dept=rtrim(isnull(zk_ward,dis_dept)),ward=rtrim(isnull(dis_ward,ward)) " +
+            "from zy_actpatient where inpatient_no=#{patNo} and admiss_times=#{times}")
+    WardDept getDismissDept2(String patNo, int times);
 
     @Select("select frequency from t_questionnaire_frequency where code=#{code} ")
     int selectQuestionnaireFrequency(String code);

src/main/java/thyyxxk/wxservice_server/entity/assessment/InpatientQuestionnaire.java

@@ -20,6 +20,7 @@ public class InpatientQuestionnaire {
     private Integer times;
     private String patientId;
     private String deptCode;
+    private String wardCode;
 
     // 您对住院科室护理人员服务满意吗
     private String zykshl;

src/main/java/thyyxxk/wxservice_server/entity/assessment/WardDept.java

@@ -0,0 +1,9 @@
+package thyyxxk.wxservice_server.entity.assessment;
+
+import lombok.Data;
+
+@Data
+public class WardDept {
+    private String ward;
+    private String dept;
+}

src/main/java/thyyxxk/wxservice_server/service/AssessmentService.java

@@ -7,11 +7,9 @@ import thyyxxk.wxservice_server.dao.AssessmentDao;
 import thyyxxk.wxservice_server.config.exception.ExceptionEnum;
 import thyyxxk.wxservice_server.dao.assessment.InpatientQuestionnaireDao;
 import thyyxxk.wxservice_server.dao.assessment.OutpatientQuestionnaireDao;
+import thyyxxk.wxservice_server.entity.PureCodeName;
 import thyyxxk.wxservice_server.entity.ResultVo;
-import thyyxxk.wxservice_server.entity.assessment.OutpatientQuestionnaire;
-import thyyxxk.wxservice_server.entity.assessment.ComplaintsAndSuggestions;
-import thyyxxk.wxservice_server.entity.assessment.DepressionQuestionnaire;
-import thyyxxk.wxservice_server.entity.assessment.InpatientQuestionnaire;
+import thyyxxk.wxservice_server.entity.assessment.*;
 import thyyxxk.wxservice_server.utils.ResultVoUtil;
 import thyyxxk.wxservice_server.utils.StringUtil;
 import thyyxxk.wxservice_server.utils.TokenUtil;
@@ -63,11 +61,13 @@ public class AssessmentService {
         if (Objects.equals(questionnaire.getInpatientNo(), "unknown")) {
             fillInpatientNo(questionnaire);
         }
-        String deptCode = dao.getDismissDept(questionnaire.getInpatientNo(), questionnaire.getTimes());
-        if (StringUtil.isBlank(deptCode)) {
-            deptCode = dao.getDismissDept2(questionnaire.getInpatientNo(), questionnaire.getTimes());
+
+        WardDept wardDept = dao.getDismissDept(questionnaire.getInpatientNo(), questionnaire.getTimes());
+        if (null == wardDept) {
+            wardDept = dao.getDismissDept2(questionnaire.getInpatientNo(), questionnaire.getTimes());
         }
-        questionnaire.setDeptCode(deptCode);
+        questionnaire.setDeptCode(wardDept.getDept());
+        questionnaire.setWardCode(wardDept.getWard());
         inpatientQuestionnaireDao.insert(questionnaire);
         return ResultVoUtil.success();
     }