修复已知问题和bug

src/main/java/thyyxxk/webserver/dao/his/casefrontsheet/JieShouHuiZhenDao.java

@@ -72,8 +72,8 @@ public interface JieShouHuiZhenDao {
             "       hz_level," +
             "       hz_level_name = (select rtrim(name) from ysh_zd_hz_level where code = hz_level)," +
             "       cast(act_order_no AS decimal)  as act_order_no " +
-            "from ysh_hz_record a with(nolock) inner join zy_actpatient b with(nolock) on   " +
-            "(b.inpatient_no = a.inpatient_no) where a.admiss_times = #{admissTimes} and a.inpatient_no = #{inpatientNo} and a.req_times = #{reqTimes}")
+            "from ysh_hz_record a with(nolock) inner join view_zy_patient_all b with(nolock) on   " +
+            "(b.inpatient_no = a.inpatient_no  and b.admiss_times = a.admiss_times)  where a.admiss_times = #{admissTimes} and a.inpatient_no = #{inpatientNo} and a.req_times = #{reqTimes}")
     JieShouHuiZhenPojo getHuanZheXinXi(@Param("admissTimes") Integer admissTimes,
                                        @Param("reqTimes") Integer reqTimes,
                                        @Param("inpatientNo") String inpatientNo);

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

@@ -107,116 +107,116 @@ public interface YiZhuLuRuDao {
                                 @Param("ledgerSn") Integer ledgerSn);
 
 
-    @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" +
-            "    mini_unit_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" +
+    @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, " +
+            "    mini_unit_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, " +
+            "    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, " +
+            "    exec_unit_name       = (select top (1) rtrim(name) " +
+            "                            from zd_unit_code with (NOLOCK) " +
+            "                            where code = exec_unit), " +
+            "                           a.dept_code, " +
+            "    dept_name            = (select top (1) rtrim(name) " +
+            "                            from zd_unit_code with (NOLOCK) " +
+            "                            where code = dept_code), " +
+            "                           a.ward_code, " +
+            "    ward_name            = (select top (1) rtrim(name) " +
+            "                            from zd_unit_code with (NOLOCK) " +
+            "                            where code = a.ward_code), " +
+            "    /*管床医生*/ " +
+            "    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) " +
             "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 " +
@@ -225,116 +225,116 @@ public interface YiZhuLuRuDao {
     List<XinZhenYzActOrder> selectOrderNo(@Param(Constants.WRAPPER) Wrapper<?> wq);
 
 
-    @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" +
-            "    mini_unit_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" +
+    @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, " +
+            "    mini_unit_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, " +
+            "    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) /* 开这个医嘱的医生 */, \\\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" +
+            "                           exec_unit, " +
+            "    exec_unit_name       = (select top (1) rtrim(name) " +
+            "                            from zd_unit_code with (NOLOCK) " +
+            "                            where code = exec_unit), " +
+            "                           a.dept_code, " +
+            "    dept_name            = (select top (1) rtrim(name) " +
+            "                            from zd_unit_code with (NOLOCK) " +
+            "                            where code = dept_code), " +
+            "                           a.ward_code, " +
+            "    ward_name            = (select top (1) rtrim(name) " +
+            "                            from zd_unit_code with (NOLOCK) " +
+            "                            where code = a.ward_code), " +
+            "    /*管床医生*/ " +
+            "    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) " +
             "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 " +

src/main/java/thyyxxk/webserver/service/examinations/BloodSugarQueryServer.java

@@ -1,5 +1,6 @@
 package thyyxxk.webserver.service.examinations;
 
+import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
@@ -44,7 +45,7 @@ public class BloodSugarQueryServer {
         returnValue.put("patientInfo", patient);
 
         List<BgNursingTestSync> list = dao.getPatientLoodSugar(panNo, times);
-
+        log.info("数据：{}", JSON.toJSONStringWithDateFormat(list, DateUtil.DEFAULT_PATTERN));
         if (ListUtil.isBlank(list)) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有查询到该患者的血糖信息。");
         }
@@ -57,7 +58,7 @@ public class BloodSugarQueryServer {
 
         for (Map.Entry<String, List<BgNursingTestSync>> entrySet : map.entrySet()) {
             Map<String, Integer> a = new HashMap<>();
-            // "空腹", "早餐后", "中餐前", "中餐后", "晚餐前", "晚餐后", "零点", "三点"
+            // "空腹", "早餐后", "中餐前", "中餐后", "晚餐前", "晚餐后", "零点", "三点",随机血糖
             a.put("空腹", 0);
             a.put("早餐后", 0);
             a.put("中餐前", 0);

src/main/java/thyyxxk/webserver/service/inpatient/PatientService.java

@@ -77,6 +77,15 @@ public class PatientService {
         return ResultVoUtil.success(data);
     }
 
+    public ResultVo<Patient> getDisPatient(String inpatientNo, Integer times) {
+        Patient data = dao.getPatientInfo(inpatientNo, "zy_inactpatient", times);
+        if (null == data) {
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有住院号【" + inpatientNo + "】的出院业务！");
+        }
+        setExpenseInformation(data);
+        return ResultVoUtil.success(data);
+    }
+
     public Patient getPatientBaseInfo(String inpatientNo){
         Patient data = dao.getPatientInfo(inpatientNo, "zy_actpatient", 0);
         if (null == data) {
@@ -186,14 +195,6 @@ public class PatientService {
     }
 
 
-    public ResultVo<Patient> getDisPatient(String inpatientNo, Integer times) {
-        Patient data = dao.getPatientInfo(inpatientNo, "zy_inactpatient", times);
-        if (null == data) {
-            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有住院号【" + inpatientNo + "】的出院业务！");
-        }
-        setExpenseInformation(data);
-        return ResultVoUtil.success(data);
-    }
 
     /**
      * 设置患者费用信息

src/main/java/thyyxxk/webserver/service/inpatient/XiangMuLuRuService.java

@@ -209,7 +209,7 @@ public class XiangMuLuRuService {
         // 获取原来的数据
         List<ZyDetailCharge> yuanTuiFeiList = dao.huoQuJuTiFeiYong(param.getInpatientNo(), param.getAdmissTimes(), ledgerSn, param.getList());
         // 获取患者自己的科室和下面的子科室
-        Set<String> deptList = new HashSet<>();
+        Set<String> deptList;
 
         UserInfo us = redisLikeService.getUserInfoByToken();
         if (us.getDeptCode().startsWith("8")) {
@@ -244,6 +244,9 @@ public class XiangMuLuRuService {
             if (BigUtils.bigXiaoYu(item.getChargeFee(), 0) || BigUtils.bigXiaoYu(item.getChargeAmount(), 0)) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号：【%s】，该数据为负数。", item.getDetailSn()));
             }
+            if (StringUtil.isBlank(item.getExecDept())) {
+                item.setExecDept(userInfo.getDeptCode());
+            }
             if ("00".equals(item.getSerial()) && !deptList.contains(item.getExecUnit())) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号：【%s】，请对应的执行科室进行退费。", item.getDetailSn()));
             }

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

@@ -1004,10 +1004,15 @@ public class YiZhuLuRuServer {
         boolean strictVerification = huanZheXinXi != null;
         List<String> errorMessage = new ArrayList<>();
         List<String> warningMessage = new ArrayList<>();
+
         if (StringUtil.isBlank(item.getGroupNo())) {
             errorMessage.add("没有药房请重新开。");
         }
 
+        if (redisLikeService.getDeptName(item.getExecUnit()) == null) {
+            errorMessage.add("执行科室有误，请检查。");
+        }
+
         if (ITEM.equals(item.getSerial())) {
             List<XinZhenYzActOrder> projectDetails = project.get(item.getOrderCode());
             // 如果这个项目下面没有费用明细，那么这就是一条口头医,口头医嘱每次只能开一个
@@ -1023,7 +1028,6 @@ public class YiZhuLuRuServer {
             }
             item.setDrugOcc(item.getDrugQuan());
         } else {
-
             if (BigUtils.bigXiaoYu(item.getDose(), 0)) {
                 errorMessage.add(String.format("医嘱：【%s】，计量不能开负数", item.getOrderName()));
             }
@@ -1150,6 +1154,9 @@ public class YiZhuLuRuServer {
                     errorMessage.add("子医嘱的医嘱号，小于父医嘱号，无法成组。【原因如果子医嘱的医嘱号小于父医嘱，会导致打印乱码】");
                 }
             }
+
+            UserInfo userInfo = redisLikeService.getUserInfoByCode(TokenUtil.getTokenUserId());
+
             // 获取患者的入院时间
             if (item.getOrderTime() == null) {
                 errorMessage.add("医嘱时间不能为空");
@@ -1159,7 +1166,7 @@ public class YiZhuLuRuServer {
                 errorMessage.add("没有查询到患者的入院时间");
             } else if (DateUtil.shiJianDaXiao(item.getStartTime(), huanZheXinXi.getAdmissDate(), "<")) {
                 errorMessage.add("开始时间不能在患者入院之前,患者入院时间" + DateUtil.formatDatetime(huanZheXinXi.getAdmissDate()));
-            } else if (DateUtil.shiJianDaXiao(item.getStartTime(), item.getOrderTime(), "<")) {
+            } else if (DateUtil.shiJianDaXiao(item.getStartTime(), item.getOrderTime(), "<") && !userInfo.getDeptCode().equals("1160000")) {
                 errorMessage.add("开始时间不能在开医嘱之前");
             }