住院医生优化

src/main/java/thyyxxk/webserver/dao/his/inpatient/PatientDao.java

@@ -43,7 +43,8 @@ public interface PatientDao {
                                @Param("userCode") String userCode);
 
     @Select("<script>" +
-            "select inpatientNo=rtrim(a.inpatient_no),a.admiss_times,a.med_type,b.social_no,dis_date, " +
+            "select inpatientNo=rtrim(a.inpatient_no),a.admiss_times,a.med_type,b.social_no,dis_date," +
+            "zk_ward,zk_ward_name = (select rtrim(name) from zd_unit_code where code=zk_ward), " +
             "name=rtrim(a.name),sex=isnull(a.sex, b.sex),act_ipt_days=(datediff(day, admiss_date, getdate())), " +
             "birthDate=(convert(varchar(10), birth_date, 21)),home_tel=rtrim(b.home_tel), " +
             "admissPhysician=rtrim(a.admiss_physician), " +

src/main/java/thyyxxk/webserver/entity/inpatient/patient/Patient.java

@@ -56,6 +56,7 @@ public class Patient {
     private String responceType;
     private Integer dismissOrder;
     private String zkWard;
+    private String zkWardName;
     private String bedNo;
     private String statusFlag;
     private String totalCharge;

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingServer.java

@@ -419,7 +419,7 @@ public class JianYanJianChaShenQingServer {
             if (StringUtil.isBlank(item.getExecDept())) {
                 cuoWuXinXi.append(baoCunCuoWuXinXi(index, "执行科室不能为空。"));
             }
-            if (param.getReqType().equals("3")) {
+            if ("3".equals(param.getReqType())) {
                 if (StringUtil.isBlank(item.getReqComment())) {
                     cuoWuXinXi.append(baoCunCuoWuXinXi(index, "病室摘要不能为空。"));
                 }