优化和修改bug

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/JianYanJianChaController.java

@@ -40,7 +40,7 @@ public class JianYanJianChaController {
     }
 
     @PostMapping("/huoQuJianChaShenQing")
-    public ResultVo<IPage<YshYjReq>> huoQuJianChaShenQing(@RequestBody @Validated ChaXunJianChaHeJianYan param) {
+    public ResultVo<List<YshYjReq>> huoQuJianChaShenQing(@RequestBody @Validated ChaXunJianChaHeJianYan param) {
         return server.huoQuJianChaShenQing(param);
     }
 
@@ -110,7 +110,7 @@ public class JianYanJianChaController {
     }
 
     @PostMapping("/huoQuJianYan")
-    public ResultVo<IPage<YshYjReq>> huoQuJianYan(@RequestBody @Validated ChaXunJianChaHeJianYan param) {
+    public ResultVo<List<YshYjReq>> huoQuJianYan(@RequestBody @Validated ChaXunJianChaHeJianYan param) {
         return server.huoQuJianYan(param);
     }
 

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

@@ -41,26 +41,10 @@ public interface JianYanJianChaDao {
                                                    @Param("name") String name,
                                                    @Param("reqType") String reqType);
 
-
-    @Select("<script>" +
-            "select order_name,req_no,act_order_no, start_time,inpatient_no,admiss_times,receive_flag " +
+    @Select("select order_name,req_no,act_order_no, start_time,inpatient_no,admiss_times,receive_flag " +
             "from ysh_yj_req with (NOLOCK) " +
-            "where inpatient_no = #{patNo}" +
-            "  and admiss_times = #{times} " +
-            "  and req_type = '3' " +
-            "<if test=\" orderName != null and orderName != '' \">" +
-            " and order_name like #{orderName} " +
-            "</if>" +
-            "<if test=\"startTime != null and startTime != '' \">" +
-            " and start_time &gt;= #{startTime} and start_time &lt;= #{endTime}" +
-            "</if>" +
-            "</script>")
-    IPage<YshYjReq> huoQuJianChaShenQing(IPage<YshYjReq> page,
-                                         @Param("patNo") String patNo,
-                                         @Param("times") Integer times,
-                                         @Param("orderName") String orderName,
-                                         @Param("startTime") String startTime,
-                                         @Param("endTime") String endTime);
+            " ${ew.customSqlSegment} ")
+    List<YshYjReq> huoQuJianChaShenQingV2(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
 
 
     @Select("select *, " +
@@ -235,7 +219,8 @@ public interface JianYanJianChaDao {
             "  and a.order_code = b.order_code " +
             "  and isnull(a.del_flag, '') <> '1'" +
             "  and isnull(c.del_flag, '') <> '1' " +
-            "  and ${ew.sqlSegment} ")
+            "  and ${ew.sqlSegment} " +
+            "  order by sort_no desc ")
     List<Map<String, String>> selectTemplateContent(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
 
 
@@ -375,9 +360,7 @@ public interface JianYanJianChaDao {
                             @Param("infantFlag") Integer infantFlag,
                             @Param("reqDate") Date reqDate);
 
-
-    @Select("<script>" +
-            "select req_no," +
+    @Select("select req_no," +
             "       inpatient_no," +
             "       admiss_times, " +
             "       group_name," +
@@ -396,24 +379,9 @@ public interface JianYanJianChaDao {
             "       inspect_stuff_name = (select rtrim(name) from jy_zd_sample with (NOLOCK) where code = inspect_stuff), " +
             "       jz_flag," +
             "       receive_flag " +
-            "from ysh_yj_req with (NOLOCK) " +
-            "where inpatient_no = #{patNo} " +
-            "  and admiss_times = #{times} " +
-            "  and req_type = '2'" +
-            "<if test=\" startTime != null and startTime != '' \"> " +
-            " and start_time &gt;=#{startTime} and start_time &lt;= #{endTime} " +
-            "</if>" +
-            "<if test=\"orderName != null and orderName != '' \">" +
-            " and order_name = #{orderName}" +
-            "</if>" +
-            "</script>")
-    Page<YshYjReq> huoQuJianYan(IPage<YshYjReq> page,
-                                @Param("patNo") String patNo,
-                                @Param("times") Integer times,
-                                @Param("startTime") String startTime,
-                                @Param("endTime") String endTime,
-                                @Param("orderName") String orderName);
-
+            " from ysh_yj_req with (NOLOCK) " +
+            " ${ew.customSqlSegment} ")
+    List<YshYjReq> huoQuJianYanV2(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
 
     @Select("SELECT rtrim(a.code) as code, " +
             "       rtrim(a.name) as name " +

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

@@ -107,107 +107,117 @@ public interface YiZhuLuRuDao {
                                 @Param("ledgerSn") Integer ledgerSn);
 
 
-    @Select("select                     a.act_order_no, " +
-            "                           cast(cast(a.act_order_no as decimal) as varchar) id," +
-            "                           newOrderFlag = (select count(*) from new_act_order_recording where new_act_order_recording.act_order_no = a.act_order_no),    " +
-            "                           order_code, " +
-            "                           order_name, " +
-            "                           rtrim(frequ_code)                              frequ_code, " +
-            "    frequ_code_name      = (select rtrim(comm) " +
-            "                            from yz_order_frequency " +
-            "                            where code = frequ_code), " +
-            "                           instruction, " +
-            "                           discription, " +
-            "                           infant_flag, " +
-            "                           order_time, " +
-            "                           physician, " +
-            "                           start_time, " +
-            "                           drug_specification, " +
-            "                           drug_quan, " +
-            "    drug_quan_name       = (select name " +
-            "                            from yp_zd_unit with (NOLOCK) " +
-            "                            where code = mini_unit), " +
-            "                           rtrim(supply_code) supply_code, " +
-            "    supply_code_name     = (select rtrim(supply_name) " +
-            "                            from yz_supply_type with (NOLOCK) " +
-            "                            where yz_supply_type.supply_code = a.supply_code), " +
-            "                           a.inpatient_no, " +
-            "                           a.admiss_times, " +
-            "                           drug_flag, " +
-            "                           enter_oper," +
-            "enter_oper_name      = (select top (1) rtrim(name) " +
-            "                            from a_employee_mi with (NOLOCK) " +
-            "                            where code = enter_oper) /* 录入人 */, " +
-            "                           enter_time, " +
-            "                           mini_unit, " +
-            "                           drug_weight, " +
-            "                           drug_weight_unit, " +
-            "                           rtrim(status_flag) status_flag, " +
-            "                           status_time, " +
-            "                           parent_no," +
-            " parent_no_name    = (select kfc.order_name from yz_act_order kfc where kfc.act_order_no = a.parent_no)," +
-            "                           self_buy, " +
-            "                           dose, " +
-            "                           dose_unit, " +
-            "    dose_unit_name       = (select name " +
-            "                            from yp_zd_unit with (NOLOCK) " +
-            "                            where dose_unit = code), " +
-            "                           drug_occ, " +
-            "                           drug_volume, " +
-            "                           drug_vol_unit, " +
-            "                           exclu_back_time, " +
-            "                           exclu_act_order_no, " +
-            "                           pay_self, " +
-            "                           serial, " +
-            "                           group_no, " +
-            "                           signer, " +
-            "                           cl_code, " +
-            "                           doctor_flag, " +
-            "                           emergency_flag, " +
-            "    exclu_type='', " +
-            "    end_time_b=end_time, " +
-            "                           exec_unit, " +
-            "                           dept_code, " +
-            "                           ward_code, " +
-            "    new_flag='0', " +
-            "    order_no_pattern=0, " +
-            "    suprice_flag='', " +
-            "    self_flag            ='', " +
-            "    pack_size=0.0, " +
-            "    parent_no_c=           -1000, " +
-            "                           reg_flag, " +
-            "    parent_flag='', " +
-            "                           yb_self_flag, " +
-            "                           kf_flag, " +
-            "                           refer_physician, " +
-            "                           consult_physician, " +
-            "    physician_name       = (select top (1) rtrim(name) " +
-            "                            from a_employee_mi with (NOLOCK) " +
-            "                            where code = physician) /* 开这个医嘱的医生 */, " +
-            "    exec_unit_name       = (select top (1) rtrim(name) " +
-            "                            from zd_unit_code with (NOLOCK) " +
-            "                            where code = exec_unit), " +
-            "    /*管床医生*/ " +
-            "    refer_physician_name = (select rtrim(name) " +
-            "                            from a_employee_mi with (NOLOCK) " +
-            "                            where code = refer_physician), " +
-            "    group_no_name        = (select rtrim(group_name) " +
-            "                            from yp_zd_group_name with (NOLOCK) " +
-            "                            where a.group_no = group_no), " +
-            "    signer_name          = (select top (1) rtrim(name) " +
-            "                            from a_employee_mi with (NOLOCK) " +
-            "                            where code = signer) /*确认人*/, " +
-            "                           confirm_time /*确认时间*/, " +
-            "                           modifier, " +
-            "    modifier_name        = (select top (1) rtrim(name) " +
-            "                            from a_employee_mi with (NOLOCK) " +
-            "                            where code = modifier) /*停止人*/, " +
-            "                           end_time /*停止时间*/," +
-            "                           b.new_ward as  zkWardCode, " +
-            "                           b.new_dept as  zkDeptCode," +
-            " kss.yyfs , kss.ssqk,kss.yysj," +
-            "   executer1       = (select name from a_employee_mi where code = executer1), " +
-            "   executer2= (select name from a_employee_mi where code = executer2) " +
+    @Select("select                     a.act_order_no,\n" +
+            "                           cast(cast(a.act_order_no as decimal) as varchar) id,\n" +
+            "    newOrderFlag         = (select count(*)\n" +
+            "                            from new_act_order_recording\n" +
+            "                            where new_act_order_recording.act_order_no = a.act_order_no),\n" +
+            "                           order_code,\n" +
+            "                           order_name,\n" +
+            "                           rtrim(frequ_code)                                frequ_code,\n" +
+            "    frequ_code_name      = (select rtrim(comm)\n" +
+            "                            from yz_order_frequency\n" +
+            "                            where code = frequ_code),\n" +
+            "                           instruction,\n" +
+            "                           discription,\n" +
+            "                           infant_flag,\n" +
+            "                           order_time,\n" +
+            "                           physician,\n" +
+            "                           start_time,\n" +
+            "                           drug_specification,\n" +
+            "                           drug_quan,\n" +
+            "    drug_quan_name       = (select name\n" +
+            "                            from yp_zd_unit with (NOLOCK)\n" +
+            "                            where code = mini_unit),\n" +
+            "                           rtrim(supply_code)                               supply_code,\n" +
+            "    supply_code_name     = (select rtrim(supply_name)\n" +
+            "                            from yz_supply_type with (NOLOCK)\n" +
+            "                            where yz_supply_type.supply_code = a.supply_code),\n" +
+            "                           a.inpatient_no,\n" +
+            "                           a.admiss_times,\n" +
+            "                           drug_flag,\n" +
+            "                           enter_oper,\n" +
+            "    enter_oper_name      = (select top (1) rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = enter_oper) /* 录入人 */,\n" +
+            "                           enter_time,\n" +
+            "                           mini_unit,\n" +
+            "                           drug_weight,\n" +
+            "                           drug_weight_unit,\n" +
+            "                           rtrim(status_flag)                               status_flag,\n" +
+            "                           status_time,\n" +
+            "                           parent_no,\n" +
+            "    parent_no_name       = (select kfc.order_name from yz_act_order kfc where kfc.act_order_no = a.parent_no),\n" +
+            "                           self_buy,\n" +
+            "                           dose,\n" +
+            "                           dose_unit,\n" +
+            "    dose_unit_name       = (select name\n" +
+            "                            from yp_zd_unit with (NOLOCK)\n" +
+            "                            where dose_unit = code),\n" +
+            "                           drug_occ,\n" +
+            "                           drug_volume,\n" +
+            "                           drug_vol_unit,\n" +
+            "                           exclu_back_time,\n" +
+            "                           exclu_act_order_no,\n" +
+            "                           pay_self,\n" +
+            "                           serial,\n" +
+            "                           group_no,\n" +
+            "                           signer,\n" +
+            "                           cl_code,\n" +
+            "                           doctor_flag,\n" +
+            "                           emergency_flag,\n" +
+            "    exclu_type='',\n" +
+            "    end_time_b=end_time,\n" +
+            "    new_flag='0',\n" +
+            "    order_no_pattern=0,\n" +
+            "    suprice_flag='',\n" +
+            "    self_flag            ='',\n" +
+            "    pack_size=0.0,\n" +
+            "    parent_no_c=           -1000,\n" +
+            "                           reg_flag,\n" +
+            "    parent_flag='',\n" +
+            "                           yb_self_flag,\n" +
+            "                           kf_flag,\n" +
+            "                           refer_physician,\n" +
+            "                           consult_physician,\n" +
+            "    physician_name       = (select top (1) rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = physician) /* 开这个医嘱的医生 */, \\\n" +
+            "                           exec_unit,\n" +
+            "    exec_unit_name       = (select top (1) rtrim(name)\n" +
+            "                            from zd_unit_code with (NOLOCK)\n" +
+            "                            where code = exec_unit),\n" +
+            "                           a.dept_code,\n" +
+            "    dept_name            = (select top (1) rtrim(name)\n" +
+            "                            from zd_unit_code with (NOLOCK)\n" +
+            "                            where code = dept_code),\n" +
+            "                           a.ward_code,\n" +
+            "    ward_name            = (select top (1) rtrim(name)\n" +
+            "                            from zd_unit_code with (NOLOCK)\n" +
+            "                            where code = a.ward_code),\n" +
+            "    /*管床医生*/\n" +
+            "    refer_physician_name = (select rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = refer_physician),\n" +
+            "    group_no_name        = (select rtrim(group_name)\n" +
+            "                            from yp_zd_group_name with (NOLOCK)\n" +
+            "                            where a.group_no = group_no),\n" +
+            "    signer_name          = (select top (1) rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = signer) /*确认人*/,\n" +
+            "                           confirm_time /*确认时间*/,\n" +
+            "                           modifier,\n" +
+            "    modifier_name        = (select top (1) rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = modifier) /*停止人*/,\n" +
+            "                           end_time /*停止时间*/,\n" +
+            "                           b.new_ward as                                    zkWardCode,\n" +
+            "                           b.new_dept as                                    zkDeptCode,\n" +
+            "                           kss.yyfs,\n" +
+            "                           kss.ssqk,\n" +
+            "                           kss.yysj,\n" +
+            "    executer1            = (select name from a_employee_mi where code = executer1),\n" +
+            "    executer2=             (select name from a_employee_mi where code = executer2) " +
             "from yz_act_order a  with (NOLOCK) left join " +
             "zy_order_zk b with (NOLOCK) on (a.act_order_no = b.act_order_no) left join " +
             "yz_act_record_kss kss on (a.act_order_no = kss.act_order_no) " +
@@ -215,107 +225,117 @@ public interface YiZhuLuRuDao {
     List<XinZhenYzActOrder> selectOrderNo(@Param(Constants.WRAPPER) Wrapper<?> wq);
 
 
-    @Select("select                     a.act_order_no, " +
-            "                           cast(cast(a.act_order_no as decimal) as varchar) id," +
-            "                           newOrderFlag = (select count(*) from new_act_order_recording where new_act_order_recording.act_order_no = a.act_order_no),    " +
-            "                           order_code, " +
-            "                           order_name, " +
-            "                           rtrim(frequ_code)                              frequ_code, " +
-            "    frequ_code_name      = (select rtrim(comm) " +
-            "                            from yz_order_frequency " +
-            "                            where code = frequ_code), " +
-            "                           instruction, " +
-            "                           discription, " +
-            "                           infant_flag, " +
-            "                           order_time, " +
-            "                           physician, " +
-            "                           start_time, " +
-            "                           drug_specification, " +
-            "                           drug_quan, " +
-            "    drug_quan_name       = (select name " +
-            "                            from yp_zd_unit with (NOLOCK) " +
-            "                            where code = mini_unit), " +
-            "                           rtrim(supply_code) supply_code, " +
-            "    supply_code_name     = (select rtrim(supply_name) " +
-            "                            from yz_supply_type with (NOLOCK) " +
-            "                            where yz_supply_type.supply_code = a.supply_code), " +
-            "                           a.inpatient_no, " +
-            "                           a.admiss_times, " +
-            "                           drug_flag, " +
-            "                           enter_oper," +
-            "enter_oper_name      = (select top (1) rtrim(name) " +
-            "                            from a_employee_mi with (NOLOCK) " +
-            "                            where code = enter_oper) /* 录入人 */, " +
-            "                           enter_time, " +
-            "                           mini_unit, " +
-            "                           drug_weight, " +
-            "                           drug_weight_unit, " +
-            "                           rtrim(status_flag) status_flag, " +
-            "                           status_time, " +
-            "                           parent_no," +
-            " parent_no_name    = (select kfc.order_name from yz_act_order kfc where kfc.act_order_no = a.parent_no)," +
-            "                           self_buy, " +
-            "                           dose, " +
-            "                           dose_unit, " +
-            "    dose_unit_name       = (select name " +
-            "                            from yp_zd_unit with (NOLOCK) " +
-            "                            where dose_unit = code), " +
-            "                           drug_occ, " +
-            "                           drug_volume, " +
-            "                           drug_vol_unit, " +
-            "                           exclu_back_time, " +
-            "                           exclu_act_order_no, " +
-            "                           pay_self, " +
-            "                           serial, " +
-            "                           group_no, " +
-            "                           signer, " +
-            "                           cl_code, " +
-            "                           doctor_flag, " +
-            "                           emergency_flag, " +
-            "    exclu_type='', " +
-            "    end_time_b=end_time, " +
-            "                           exec_unit, " +
-            "                           dept_code, " +
-            "                           ward_code, " +
-            "    new_flag='0', " +
-            "    order_no_pattern=0, " +
-            "    suprice_flag='', " +
-            "    self_flag            ='', " +
-            "    pack_size=0.0, " +
-            "    parent_no_c=           -1000, " +
-            "                           reg_flag, " +
-            "    parent_flag='', " +
-            "                           yb_self_flag, " +
-            "                           kf_flag, " +
-            "                           refer_physician, " +
-            "                           consult_physician, " +
-            "    physician_name       = (select top (1) rtrim(name) " +
-            "                            from a_employee_mi with (NOLOCK) " +
-            "                            where code = physician) /* 开这个医嘱的医生 */, " +
-            "    exec_unit_name       = (select top (1) rtrim(name) " +
-            "                            from zd_unit_code with (NOLOCK) " +
-            "                            where code = exec_unit), " +
-            "    /*管床医生*/ " +
-            "    refer_physician_name = (select rtrim(name) " +
-            "                            from a_employee_mi with (NOLOCK) " +
-            "                            where code = refer_physician), " +
-            "    group_no_name        = (select rtrim(group_name) " +
-            "                            from yp_zd_group_name with (NOLOCK) " +
-            "                            where a.group_no = group_no), " +
-            "    signer_name          = (select top (1) rtrim(name) " +
-            "                            from a_employee_mi with (NOLOCK) " +
-            "                            where code = signer) /*确认人*/, " +
-            "                           confirm_time /*确认时间*/, " +
-            "                           modifier, " +
-            "    modifier_name        = (select top (1) rtrim(name) " +
-            "                            from a_employee_mi with (NOLOCK) " +
-            "                            where code = modifier) /*停止人*/, " +
-            "                           end_time /*停止时间*/," +
-            "                           b.new_ward as  zkWardCode, " +
-            "                           b.new_dept as  zkDeptCode," +
-            " kss.yyfs , kss.ssqk,kss.yysj," +
-            "   executer1       = (select name from a_employee_mi where code = executer1), " +
-            "   executer2= (select name from a_employee_mi where code = executer2) " +
+    @Select("select                     a.act_order_no,\n" +
+            "                           cast(cast(a.act_order_no as decimal) as varchar) id,\n" +
+            "    newOrderFlag         = (select count(*)\n" +
+            "                            from new_act_order_recording\n" +
+            "                            where new_act_order_recording.act_order_no = a.act_order_no),\n" +
+            "                           order_code,\n" +
+            "                           order_name,\n" +
+            "                           rtrim(frequ_code)                                frequ_code,\n" +
+            "    frequ_code_name      = (select rtrim(comm)\n" +
+            "                            from yz_order_frequency\n" +
+            "                            where code = frequ_code),\n" +
+            "                           instruction,\n" +
+            "                           discription,\n" +
+            "                           infant_flag,\n" +
+            "                           order_time,\n" +
+            "                           physician,\n" +
+            "                           start_time,\n" +
+            "                           drug_specification,\n" +
+            "                           drug_quan,\n" +
+            "    drug_quan_name       = (select name\n" +
+            "                            from yp_zd_unit with (NOLOCK)\n" +
+            "                            where code = mini_unit),\n" +
+            "                           rtrim(supply_code)                               supply_code,\n" +
+            "    supply_code_name     = (select rtrim(supply_name)\n" +
+            "                            from yz_supply_type with (NOLOCK)\n" +
+            "                            where yz_supply_type.supply_code = a.supply_code),\n" +
+            "                           a.inpatient_no,\n" +
+            "                           a.admiss_times,\n" +
+            "                           drug_flag,\n" +
+            "                           enter_oper,\n" +
+            "    enter_oper_name      = (select top (1) rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = enter_oper) /* 录入人 */,\n" +
+            "                           enter_time,\n" +
+            "                           mini_unit,\n" +
+            "                           drug_weight,\n" +
+            "                           drug_weight_unit,\n" +
+            "                           rtrim(status_flag)                               status_flag,\n" +
+            "                           status_time,\n" +
+            "                           parent_no,\n" +
+            "    parent_no_name       = (select kfc.order_name from yz_act_order kfc where kfc.act_order_no = a.parent_no),\n" +
+            "                           self_buy,\n" +
+            "                           dose,\n" +
+            "                           dose_unit,\n" +
+            "    dose_unit_name       = (select name\n" +
+            "                            from yp_zd_unit with (NOLOCK)\n" +
+            "                            where dose_unit = code),\n" +
+            "                           drug_occ,\n" +
+            "                           drug_volume,\n" +
+            "                           drug_vol_unit,\n" +
+            "                           exclu_back_time,\n" +
+            "                           exclu_act_order_no,\n" +
+            "                           pay_self,\n" +
+            "                           serial,\n" +
+            "                           group_no,\n" +
+            "                           signer,\n" +
+            "                           cl_code,\n" +
+            "                           doctor_flag,\n" +
+            "                           emergency_flag,\n" +
+            "    exclu_type='',\n" +
+            "    end_time_b=end_time,\n" +
+            "    new_flag='0',\n" +
+            "    order_no_pattern=0,\n" +
+            "    suprice_flag='',\n" +
+            "    self_flag            ='',\n" +
+            "    pack_size=0.0,\n" +
+            "    parent_no_c=           -1000,\n" +
+            "                           reg_flag,\n" +
+            "    parent_flag='',\n" +
+            "                           yb_self_flag,\n" +
+            "                           kf_flag,\n" +
+            "                           refer_physician,\n" +
+            "                           consult_physician,\n" +
+            "    physician_name       = (select top (1) rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = physician) /* 开这个医嘱的医生 */, \\\n" +
+            "                           exec_unit,\n" +
+            "    exec_unit_name       = (select top (1) rtrim(name)\n" +
+            "                            from zd_unit_code with (NOLOCK)\n" +
+            "                            where code = exec_unit),\n" +
+            "                           a.dept_code,\n" +
+            "    dept_name            = (select top (1) rtrim(name)\n" +
+            "                            from zd_unit_code with (NOLOCK)\n" +
+            "                            where code = dept_code),\n" +
+            "                           a.ward_code,\n" +
+            "    ward_name            = (select top (1) rtrim(name)\n" +
+            "                            from zd_unit_code with (NOLOCK)\n" +
+            "                            where code = a.ward_code),\n" +
+            "    /*管床医生*/\n" +
+            "    refer_physician_name = (select rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = refer_physician),\n" +
+            "    group_no_name        = (select rtrim(group_name)\n" +
+            "                            from yp_zd_group_name with (NOLOCK)\n" +
+            "                            where a.group_no = group_no),\n" +
+            "    signer_name          = (select top (1) rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = signer) /*确认人*/,\n" +
+            "                           confirm_time /*确认时间*/,\n" +
+            "                           modifier,\n" +
+            "    modifier_name        = (select top (1) rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = modifier) /*停止人*/,\n" +
+            "                           end_time /*停止时间*/,\n" +
+            "                           b.new_ward as                                    zkWardCode,\n" +
+            "                           b.new_dept as                                    zkDeptCode,\n" +
+            "                           kss.yyfs,\n" +
+            "                           kss.ssqk,\n" +
+            "                           kss.yysj,\n" +
+            "    executer1            = (select name from a_employee_mi where code = executer1),\n" +
+            "    executer2=             (select name from a_employee_mi where code = executer2) " +
             "from yz_inact_order a  with (NOLOCK) left join " +
             "zy_order_zk b with (NOLOCK) on (a.act_order_no = b.act_order_no) left join " +
             "yz_act_record_kss kss on (a.act_order_no = kss.act_order_no) " +
@@ -469,7 +489,7 @@ public interface YiZhuLuRuDao {
                                         List<String> list);
 
     @Select("select count(1) from zy_actpatient where inpatient_no = #{patNo} and admiss_times = #{times}")
-    int inTheHospital(String patNo,Integer times);
+    int inTheHospital(String patNo, Integer times);
 
     @Update("<script>" +
             "update zy_detail_charge " +

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/XinZhenYzActOrder.java

@@ -312,12 +312,12 @@ public class XinZhenYzActOrder {
      * 患者的科室
      */
     private String deptCode;
-    private String deptCodeName;
+    private String deptName;
     /**
      * 患者病区
      */
     private String wardCode;
-    private String wardCodeName;
+    private String wardName;
 
     /**
      * 表里面的新增标志
@@ -335,8 +335,6 @@ public class XinZhenYzActOrder {
 
 
 
-
-
     /*
      * 如果这个药是抗菌药物的话 就需要在 yz_act_record_kss中插入
      * */

src/main/java/thyyxxk/webserver/scheduled/EmrTask.java

@@ -33,17 +33,9 @@ public class EmrTask {
     public void historyDelete() {
         if (executeScheduled) {
             emr.historyDelete(7);
-            log.info("删除电子病历历史记录 --> {} ", "asd");
+            log.info("删除电子病历历史记录");
         }
     }
 
-    //    @PostConstruct
-    public void test() {
-        JSONObject js = emr.historyDelete(30);
-        log.info("删除30天的电子病历-> {}", js);
-    }
-
-
-
 
 }

src/main/java/thyyxxk/webserver/service/externalhttp/emr/EmrEditor.java

@@ -59,7 +59,7 @@ public interface EmrEditor {
     @Get("/category/list/dept?code={deptCode}")
     JSONArray getDeptList(@Var("deptCode") String deptCode);
 
-    @Get("/document/history/destory/{countDay}")
+    @Get("/document/history/destroy/{countDay}")
     JSONObject historyDelete(@Var("countDay") Integer countDay);
 
     /**

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

@@ -225,7 +225,7 @@ public class CaoYaoYiZhuService {
         dao.chaRuYiZhu(param, "草药医嘱:" + param.getOrderName() + param.getQuantity() + "剂",
                 huanZheXinXi.getDeptCode(),
                 huanZheXinXi.getDeptCode(),
-                huanZheXinXi.getZkWard(),
+                param.getExecDept(),
                 PublicServer.getInfantFlag(huanZheXinXi.getInpatientNo()));
     }
 

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

@@ -83,10 +83,26 @@ public class JianYanJianChaShenQingService {
      * @param param 检查申请
      * @return 返回数据
      */
-    public ResultVo<IPage<YshYjReq>> huoQuJianChaShenQing(ChaXunJianChaHeJianYan param) {
-        IPage<YshYjReq> page = new Page<>(param.getCurrentPage(), param.getPageSize(), param.getTotal() == 0);
-        page = dao.huoQuJianChaShenQing(page, param.getPatNo(), param.getTimes(), param.getOrderName(), param.getStartTime(), param.getEndTime());
-        return ResultVoUtil.success(page);
+    public ResultVo<List<YshYjReq>> huoQuJianChaShenQing(ChaXunJianChaHeJianYan param) {
+        QueryWrapper<?> qw = new QueryWrapper<>();
+        qw.eq("inpatient_no", param.getPatNo());
+        qw.eq("admiss_times", param.getTimes());
+        qw.eq("req_type", "3");
+
+        if (StringUtil.notBlank(param.getOrderName())) {
+            qw.like("order_name", param.getOrderName());
+        }
+
+        if (StringUtil.notBlank(param.getStartTime())) {
+            qw.ge("start_time", param.getStartTime())
+                    .le("start_time", param.getEndTime());
+        }
+
+        qw.orderByDesc("req_date");
+
+        List<YshYjReq> list = dao.huoQuJianChaShenQingV2(qw);
+
+        return ResultVoUtil.success(list);
     }
 
     public ResultVo<Map<String, Object>> huoQuShengQingXiangQing(Integer reqNo) {
@@ -483,11 +499,22 @@ public class JianYanJianChaShenQingService {
 
 
     /*-------------------------------------------------------------- 下面是检验的逻辑 -----------------------------------------------------------------------------------------------------*/
-    public ResultVo<IPage<YshYjReq>> huoQuJianYan(ChaXunJianChaHeJianYan param) {
-        Page<YshYjReq> page = new Page<>(param.getCurrentPage(), param.getPageSize(), param.getTotal() == 0);
-        page.addOrder(OrderItem.desc("act_order_no"));
-        page = dao.huoQuJianYan(page, param.getPatNo(), param.getTimes(), param.getStartTime(), param.getEndTime(), param.getOrderName());
-        return ResultVoUtil.success(page);
+    public ResultVo<List<YshYjReq>> huoQuJianYan(ChaXunJianChaHeJianYan param) {
+        QueryWrapper<?> qw = new QueryWrapper<>();
+        qw.eq("inpatient_no", param.getPatNo());
+        qw.eq("admiss_times", param.getTimes());
+        qw.eq("req_type", "2");
+
+        if (StringUtil.notBlank(param.getStartTime())) {
+            qw.ge("start_time", param.getStartTime())
+                    .le("start_time", param.getEndTime());
+        }
+        if (StringUtil.notBlank(param.getOrderName())) {
+            qw.like("order_name", param.getOrderName());
+        }
+
+        List<YshYjReq> list = dao.huoQuJianYanV2(qw);
+        return ResultVoUtil.success(list);
     }
 
     public ResultVo<IPage<JcZdClass>> huoQuJianYanMing(long total, long currentPage, Integer leiXing) {

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

@@ -104,6 +104,15 @@ public class YiZhuLuRuServer {
         return ResultVoUtil.success(dao.getMyPatient(TokenUtil.getTokenUserId()));
     }
 
+    public List<XinZhenYzActOrder> getOrder(QueryWrapper<?> qw) {
+        return dao.selectOrderNo(qw);
+    }
+
+    public List<XinZhenYzActOrder> getinOrder(QueryWrapper<?> qw) {
+        return dao.selectOrderNo(qw);
+    }
+
+
     /**
      * 获取医嘱的数据
      * 可以根据，医嘱时间区间，执行频率，医嘱名
@@ -659,7 +668,7 @@ public class YiZhuLuRuServer {
         if (yz == null) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "原医嘱找不到了。");
         }
-        if ("6".equals(yz.getStatusFlag())) {
+        if ("-1".equals(yz.getStatusFlag())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医嘱已作废了。");
         }
         UserInfo userInfo = redisLikeService.getUserInfoByToken();