检查申请单新增字段

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -80,7 +80,8 @@ public interface JianYanJianChaDao {
             "                         confirm_id,\n" +
             "                         quantity,\n" +
             "    inspect_stuff_name = (select rtrim(name) from jy_zd_sample with (NOLOCK) where code = inspect_stuff),\n" +
-            "    req_dept_name      = (select rtrim(name) from zd_unit_code where code = req_dept),\n" +
+            "    req_dept_name      = (select rtrim(name) from zd_unit_code where code = req_dept)," +
+            "  req_ward_name      = (select rtrim(name) from zd_unit_code where code = req_ward),\n" +
             "    req_doctor_name    = (select rtrim(name) from a_employee_mi where code = req_doctor),\n" +
             "                         case\n" +
             "                             when req_type = '2' then (select rtrim(class)\n" +
@@ -351,7 +352,8 @@ public interface JianYanJianChaDao {
             "       req_doctor, " +
             "       req_doctor_name= (select rtrim(name) from a_employee_mi with (NOLOCK) where code = req_doctor), " +
             "       req_dept, " +
-            "       req_dept_name = (select rtrim(name) from zd_unit_code with (NOLOCK) where code = req_dept), " +
+            "       req_dept_name = (select rtrim(name) from zd_unit_code with (NOLOCK) where code = req_dept)," +
+            "       req_ward_name      = (select rtrim(name) from zd_unit_code where code = req_ward), " +
             "       exec_dept, " +
             "       exec_dept_name = (select rtrim(name) from zd_unit_code with (NOLOCK) where code = exec_dept), " +
             "       req_date, " +
@@ -372,7 +374,6 @@ public interface JianYanJianChaDao {
             "group by a.code, a.name ")
     IPage<JcZdClass> jianYanFenLei(IPage<JcZdClass> page);
 
-
     @Select("select rtrim(code) as code,name from jy_zd_sample with (NOLOCK) " +
             "where (name like #{name} " +
             "    or py_code like #{name} " +
@@ -584,5 +585,4 @@ public interface JianYanJianChaDao {
     List<JyJcCheckItemDto> selectJyJcCheckItemDto(@Param("ew") QueryWrapper<?> queryWrapper, @Param("tableName") String tableName);
 
 
-
 }

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/jianyanjiancha/YshYjReq.java

@@ -225,6 +225,8 @@ public class YshYjReq implements Serializable {
 
     private String patientUid;
 
+    private String reqWardName;
+
 
     public String getReceiveFlagName() {
         if (receiveFlag == null) {

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/jianyanjiancha/vo/PrintYshReqVo.java

@@ -5,6 +5,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -30,6 +31,8 @@ public class PrintYshReqVo {
 
     private String reqDept;
     private String reqDoctor;
+    private String reqDate;
+    private String reqWard;
 
     /**
      * 注意事项