删除没有的东西

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

@@ -227,26 +227,6 @@ public interface ShouShuShenQingDao extends BaseMapper<OpRecord> {
                         @Param("bedNo") String bedNo,
                         @Param("admissWard") String admissWard);
 
-    @Insert("<script>" +
-            "INSERT INTO yz_act_order (order_code, order_name, frequ_code, infant_flag, order_time, physician, start_time, " +
-            "                          act_order_no, inpatient_no, admiss_times, drug_flag, enter_oper, enter_time, status_flag, " +
-            "                          signer, confirm_time, " +
-            "                          self_buy, pay_self, serial, group_no, doctor_flag, dept_code, ward_code, reg_flag," +
-            "yb_self_flag,emergency_flag,exec_unit) " +
-            " VALUES " +
-            "<foreach collection='list' item='item' separator=','>" +
-            " ('${yzCode}',  '${item.orderName}', 'ONCE', #{p.infantFlag}, getdate(), #{userCode}, getdate(), " +
-            "        #{item.actOrderNo}, #{p.inpatientNo}, " +
-            "        #{p.admissTimes}, 'p', #{userCode}, getdate(), '1', #{userCode}, getdate(), '0', '0', '00', '00', '1', #{p.deptCode}, #{p.deptCode}," +
-            "'1',#{item.ybSelfFlag},#{item.urgentClinicFlag},#{execUnit})" +
-            "</foreach>" +
-            "</script>")
-    void chaRuYiZhu(@Param("list") List<OpRecord> list,
-                    @Param("p") XinZhenYiZhu p,
-                    @Param("userCode") String userCode,
-                    @Param("execUnit") String execUnit,
-                    @Param("yzCode") String yzCode);
-
     @Insert("INSERT INTO yz_act_order (order_code, order_name, frequ_code, infant_flag, order_time, physician, start_time, " +
             "                          act_order_no, inpatient_no, admiss_times, drug_flag, enter_oper, enter_time, status_flag, " +
             "                          signer, confirm_time, " +

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

@@ -988,55 +988,6 @@ public interface YiZhuLuRuDao {
     XinZhenYiZhu queryPatientInfo(@Param("patNo") String patNo,
                                   @Param("times") Integer times);
 
-    @Insert("<script>" +
-            "INSERT INTO yz_act_order (order_code, order_name, frequ_code, instruction, discription, infant_flag, order_time, " +
-            "    /*录入人*/physician, start_time, drug_specification, drug_quan, supply_code, act_order_no, inpatient_no, " +
-            "                          admiss_times, drug_flag/*药品中找这个是 药品的类型 a i d*/, enter_oper, /*录入时间*/ enter_time, " +
-            "                          mini_unit /*药品中找 最小包装规格*/, " +
-            "                          drug_weight/*药品的重量*/, drug_weight_unit/*药品重量单位*/, " +
-            "                          status_flag/*2*/, self_buy, dose, dose_unit, /*这个是算出来的 输入的 dose 除以选中的单位 */drug_occ, drug_volume/*药品中的 volum 找*/, " +
-            "                          drug_vol_unit/* 药品中的 vol_unit */, pay_self/*0*/, " +
-            "                          serial/*前端传*/, group_no/*药房 */, doctor_flag/*写死为 1*/, exec_unit, dept_code/* 在院病人表中的 dept */, " +
-            "                          ward_code /* 在院病人表中的 zk_ward*/, " +
-            "                          reg_flag/* 0 */, " +
-            "                          yb_self_flag/*医保自费标志*/,emergency_flag, " +
-            "                          kf_flag /*饭前饭后*/,parent_no, refer_physician/*患者的管床医生*/, confirm_time/*确认时间*/, signer/*确认人*/,end_time,modifier) " +
-            "VALUES " +
-            "<foreach collection='list' item='item' separator=','>" +
-            "(#{item.orderCode,jdbcType=VARCHAR}, #{item.orderName,jdbcType=VARCHAR}, #{item.frequCode,jdbcType=VARCHAR}," +
-            " #{item.instruction,jdbcType=VARCHAR}, #{item.discription,jdbcType=VARCHAR}, #{infantFlag,jdbcType=VARCHAR}, " +
-            "#{item.orderTime,jdbcType=VARCHAR}, " +
-            "        #{inputCode,jdbcType=TIMESTAMP}, #{item.startTime,jdbcType=TIMESTAMP}, #{item.drugSpecification}, " +
-            "#{item.drugQuan,jdbcType=DECIMAL}," +
-            " #{item.supplyCode}," +
-            " #{item.actOrderNo,jdbcType=DECIMAL}, #{patNo}, #{times}, " +
-            "#{item.drugFlag}," +
-            " #{inputCode}, " +
-            " getdate(), #{item.miniUnit}, " +
-            "#{item.drugWeight,jdbcType=DECIMAL}, " +
-            "#{item.drugWeightUnit}, '2', #{item.selfBuy}, " +
-            "cast(#{item.dose,jdbcType=DECIMAL} as decimal(10,2))," +
-            " #{item.doseUnit}, " +
-            "cast(#{item.drugOcc,jdbcType=DECIMAL} as decimal(10,2))," +
-            "cast(#{item.drugVolume,jdbcType=DECIMAL} as decimal(10,2))," +
-            " #{item.drugVolUnit}, 0, #{item.serial}, " +
-            "#{item.groupNo}," +
-            "'1', #{item.execUnit}, " +
-            "#{deptCode}, #{wardCode}, '0', #{item.ybSelfFlag},#{item.emergencyFlag}, #{item.kfFlag}," +
-            "#{item.parentNo,jdbcType=DECIMAL}," +
-            " #{referPhysician}, getdate(), #{inputCode},#{item.endTime,jdbcType=TIMESTAMP},#{item.modifier})" +
-            "</foreach>" +
-            "</script>")
-    void chaRuYiZhu(@Param("patNo") String patNo,
-                    @Param("times") Integer times,
-                    @Param("inputCode") String inputCode,
-                    @Param("infantFlag") Integer infantFlag,
-                    @Param("deptCode") String deptCode,
-                    @Param("wardCode") String wardCode,
-                    @Param("referPhysician") String referPhysician,
-                    @Param("list") List<XinZhenYzActOrder> list);
-
-
     @Select("<script>" +
             "select top 20 * from (" +
             "SELECT row_number() over (order by pattern_code ) row_number," +

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/yizhuverify/YiZhuCheckData.java

@@ -197,8 +197,6 @@ public class YiZhuCheckData {
             errorMessage.add(String.format("医嘱：【%s】，计量不能开负数", item.getOrderName()));
         }
 
-
-
         if (StringUtil.isBlank(item.getDrugSpecification())) {
             errorMessage.add("药品规格不能为空");
         }
@@ -278,8 +276,6 @@ public class YiZhuCheckData {
             // 计算普通药品的领量 durg_quan durg_occ
             calculateDrugAmount(item, detailsOfDrugs);
         }
-
-
     }
 
     private void strictVerificationFunc(XinZhenYzActOrder item) {
@@ -335,11 +331,13 @@ public class YiZhuCheckData {
         item.setDrugVolume(feiYongXinXi.getDrugVolume());
         item.setDrugVolUnit(feiYongXinXi.getDrugWeightUnit());
 
-        if (StringUtil.notBlank(feiYongXinXi.getDrugWeightUnit()) && item.getDoseUnit().trim().equals(feiYongXinXi.getDrugWeightUnit().trim())) {
+        String doseUnit = StringUtil.notBlank(item.getDoseUnit()) ? "" : item.getDoseUnit().trim();
+
+        if (StringUtil.notBlank(feiYongXinXi.getDrugWeightUnit()) && doseUnit.equals(feiYongXinXi.getDrugWeightUnit().trim())) {
             item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getDrugWeight(), 2));
-        } else if (StringUtil.notBlank(feiYongXinXi.getDrugVolUnit()) && item.getDoseUnit().trim().equals(feiYongXinXi.getDrugVolUnit())) {
+        } else if (StringUtil.notBlank(feiYongXinXi.getDrugVolUnit()) && doseUnit.equals(feiYongXinXi.getDrugVolUnit().trim())) {
             item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getDrugVolume(), 2));
-        } else if (StringUtil.notBlank(feiYongXinXi.getPackUnit()) && item.getDoseUnit().trim().equals(feiYongXinXi.getPackUnit())) {
+        } else if (StringUtil.notBlank(feiYongXinXi.getPackUnit()) && doseUnit.equals(feiYongXinXi.getPackUnit().trim())) {
             item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getPackSize(), 2));
         }
     }