소스 검색

医嘱添加录入状态

xiao 2 년 전
부모
커밋
09537cc6fc

+ 16 - 0
src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/YizhuLuRuController.java

@@ -32,11 +32,27 @@ public class YizhuLuRuController {
     }
 
 
+    @GetMapping("/getOrderNo")
+    public ResultVo<String> getOrderNo() {
+        return server.getOrderNo();
+    }
+
     @GetMapping("/getMyPatient")
     public ResultVo<List<Patient>> getMyPatient() {
         return server.getMyPatient();
     }
 
+    @PostMapping("/enterOrders")
+    public ResultVo<Map<String, Object>> enterOrders(@RequestBody XinZhenYiZhu param) {
+        return server.enterOrders(param);
+    }
+
+    @GetMapping("/getParentOrders")
+    public ResultVo<List<XinZhenYzActOrder>> getParentOrders(@RequestParam("patNo") String patNo,
+                                                             @RequestParam("times") String times) {
+        return server.getParentOrders(patNo, times);
+    }
+
 
     @GetMapping("/huoQuYiZhuMingCheng")
     public ResultVo<List<GetDropdownBox>> huoQuYiZhuMingCheng(@RequestParam("inpatientNo") String inpatientNo,

+ 63 - 0
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/YiZhuLuRuDao.java

@@ -246,6 +246,36 @@ public interface YiZhuLuRuDao {
     List<YiZhuMingChen> yiZhuYaoPing(@Param("code") String code,
                                      @Param("groupNo") String groupNo);
 
+    @Delete("delete yz_act_order where " +
+            "act_order_no = #{orderNo} and inpatient_no = #{patNo} and admiss_times = #{times}")
+    void deleteOrderNo(String orderNo,
+                       String patNo,
+                       Integer times);
+
+    @Insert("INSERT INTO yz_act_order (order_code, order_name, frequ_code, instruction, discription, infant_flag, order_time,\n" +
+            "    /*录入人*/physician, start_time, drug_specification, drug_quan, supply_code, act_order_no, inpatient_no,\n" +
+            "                          admiss_times, drug_flag/*药品中找这个是 药品的类型 a i d*/, enter_oper, /*录入时间*/\n" +
+            "                          enter_time,\n" +
+            "                          mini_unit /*药品中找 最小包装规格*/,\n" +
+            "                          drug_weight/*药品的重量*/, drug_weight_unit/*药品重量单位*/,\n" +
+            "                          status_flag/*1*/, self_buy, dose, dose_unit, drug_occ, drug_volume/*药品中的 volum 找*/,\n" +
+            "                          drug_vol_unit/* 药品中的 vol_unit */, pay_self/*0*/,\n" +
+            "                          serial/*前端传*/, group_no/*药房 */, doctor_flag/*写死为 1*/, exec_unit, dept_code/* 在院病人表中的 dept */,\n" +
+            "                          ward_code /* 在院病人表中的 zk_ward*/,\n" +
+            "                          reg_flag/* 0 */,\n" +
+            "                          yb_self_flag/*医保自费标志*/, emergency_flag,\n" +
+            "                          kf_flag /*饭前饭后*/, parent_no, refer_physician/*患者的管床医生*/, end_time)\n" +
+            "values (#{pa.orderCode}, #{pa.orderName}, #{pa.frequCode}, #{pa.instruction}, #{pa.discription}, #{patInfo.infantFlag},\n" +
+            "        #{pa.orderTime}, #{userCode},\n" +
+            "        #{pa.startTime}, #{pa.drugSpecification}, #{pa.drugQuan,jdbcType=REAL}, #{pa.supplyCode}, #{pa.actOrderNo,jdbcType=REAL}, #{patInfo.inpatientNo},\n" +
+            "        #{patInfo.admissTimes}, #{pa.drugFlag}, #{userCode}, getdate(),\n" +
+            "        #{pa.miniUnit}, #{pa.drugWeight,jdbcType = REAL}, #{pa.drugWeightUnit,jdbcType=REAL}, '1', #{pa.selfBuy},\n" +
+            "        #{pa.dose ,jdbcType = REAL}, #{pa.doseUnit}, #{pa.drugOcc ,jdbcType = REAL},\n" +
+            "        #{pa.drugVolume,jdbcType=REAL}, #{pa.drugVolUnit}, '0', #{pa.serial}, #{pa.groupNo}, '1', #{pa.execUnit},\n" +
+            "        #{patInfo.deptCode}, #{patInfo.deptCode}, '0', #{pa.ybSelfFlag}, #{pa.emergencyFlag},\n" +
+            "        #{pa.kfFlag}, #{pa.parentNo,jdbcType=REAL}, #{patInfo.referPhysician}, #{pa.endTime})")
+    void insertEntryOrder(XinZhenYiZhu patInfo, XinZhenYzActOrder pa, String userCode);
+
 
     @Select("SELECT rtrim(a.order_code) + '00' as id," +
             "a.py_code, " +
@@ -281,6 +311,39 @@ public interface YiZhuLuRuDao {
     List<YiZhuMingChen> yiZhuXiangMu(String code);
 
 
+    @Select("SELECT yz_act_order.act_order_no,\n" +
+            "       yz_act_order.order_name,\n" +
+            "       yz_act_order.order_time,\n" +
+            "       yz_act_order.start_time,\n" +
+            "       yz_act_order.status_flag,\n" +
+            "       yz_act_order.order_name + '(' + rtrim(convert(char, act_order_no)) + ')',\n" +
+            "       sort_flag='1'\n" +
+            "FROM yz_act_order\n" +
+            "WHERE (yz_act_order.inpatient_no = #{patNo})\n" +
+            "  AND (yz_act_order.admiss_times = #{times})\n" +
+            "  AND (isnull(yz_act_order.parent_no, 0) = 0)\n" +
+            "  and yz_act_order.status_flag < '5'\n" +
+            "  and yz_act_order.drug_flag = 'i'\n" +
+            "union\n" +
+            "select yz_act_order.act_order_no,\n" +
+            "       yz_act_order.order_name,\n" +
+            "       yz_act_order.order_time,\n" +
+            "       yz_act_order.start_time,\n" +
+            "       yz_act_order.status_flag,\n" +
+            "       yz_act_order.order_name + '(' + rtrim(convert(char, act_order_no)) + ')',\n" +
+            "       sort_flag='1'\n" +
+            "FROM yz_act_order,\n" +
+            "     yp_zd_dict b\n" +
+            "WHERE (yz_act_order.inpatient_no = #{patNo})\n" +
+            "  AND (yz_act_order.admiss_times = #{times})\n" +
+            "  AND (isnull(yz_act_order.parent_no, 0) = 0)\n" +
+            "  and yz_act_order.status_flag < '5'\n" +
+            "  and yz_act_order.order_code = b.code\n" +
+            "  and yz_act_order.serial = b.serial\n" +
+            "  and left(b.dosage, 2) = '19'")
+    List<XinZhenYzActOrder> getParentOrders(String patNo, String times);
+
+
     @Select("SELECT cast(rtrim(isnull(nullif(del_flag,\n" +
             "                                ''),\n" +
             "                         0)) as int) as del_flag,\n" +

+ 10 - 0
src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/XinZhenYiZhu.java

@@ -1,6 +1,7 @@
 package thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru;
 
 import lombok.Data;
+import thyyxxk.webserver.service.PublicServer;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -46,6 +47,10 @@ public class XinZhenYiZhu {
      */
     private Integer infantFlag;
 
+    public String getInfantFlag() {
+        return inpatientNo == null ? null : String.valueOf(PublicServer.getInfantFlag(inpatientNo));
+    }
+
     /**
      * 是否插入医嘱
      */
@@ -93,6 +98,11 @@ public class XinZhenYiZhu {
      */
     private XinZhenYzActOrder data;
 
+    /**
+     * 医嘱号
+     */
+    private String actOrderNo;
+
 
     @NotNull(message = "上传数据不能为空")
     private List<XinZhenYzActOrder> list;

+ 1 - 1
src/main/java/thyyxxk/webserver/service/PublicServer.java

@@ -208,7 +208,7 @@ public class PublicServer {
      * @param inpatientNo 住院号
      * @return 返回婴儿标志
      */
-    public int getInfantFlag(String inpatientNo) {
+    public static int getInfantFlag(String inpatientNo) {
         if (StringUtil.isBlank(inpatientNo)) {
             return 0;
         }

+ 1 - 1
src/main/java/thyyxxk/webserver/service/heliyongyao/RationalUseServer.java

@@ -154,7 +154,7 @@ public class RationalUseServer {
                 .append("<patient>")
                 .append("<pati_id>").append(patNo).append("_").append(times).append("</pati_id>")
                 .append("<name>").append(nullToBlank(patient.getName())).append("</name>")
-                .append("<is_infant>").append(publicServer.getInfantFlag(patNo)).append("</is_infant>")
+                .append("<is_infant>").append(PublicServer.getInfantFlag(patNo)).append("</is_infant>")
                 .append("<birth>").append(nullToBlank(patient.getBirth())).append("</birth>")
                 .append("<sex>").append(nullToBlank(patient.getSex())).append("</sex>")
                 .append("<weight>").append("").append("</weight>")

+ 7 - 7
src/main/java/thyyxxk/webserver/service/inpatient/XiangMuLuRuService.java

@@ -117,7 +117,7 @@ public class XiangMuLuRuService {
         List<Integer> yongHuJueSe = userInfo.getRoles();
 
         // 判断是否为婴儿
-        int infantFlag = publicServer.getInfantFlag(param.getInpatientNo());
+        int infantFlag = PublicServer.getInfantFlag(param.getInpatientNo());
         if (infantFlag == 1) {
             param.setInpatientNo(param.getInpatientNo().split("\\$")[0]);
         }
@@ -426,7 +426,7 @@ public class XiangMuLuRuService {
         }
         // 婴儿 要特殊处理
         // 如果带有这个 $ 说明是婴儿
-        int infantFlag = publicServer.getInfantFlag(param.getInpatientNo());
+        int infantFlag = PublicServer.getInfantFlag(param.getInpatientNo());
         param.setInpatientNo(publicServer.getInpatientNo(param.getInpatientNo()));
         // 获取最大流水号
         Integer maxDetailSn = publicServer.getMaxDetailSn(param.getInpatientNo(), param.getAdmissTimes());
@@ -554,7 +554,7 @@ public class XiangMuLuRuService {
         if (StringUtil.isBlank(inpatientNo) || admissTimes == null || StringUtil.isBlank(deptCode)) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "患者信息不全。");
         }
-        int infantFlag = publicServer.getInfantFlag(inpatientNo);
+        int infantFlag = PublicServer.getInfantFlag(inpatientNo);
         inpatientNo = publicServer.getInpatientNo(inpatientNo);
         Integer ledgerSn = publicServer.getLedgerSn(inpatientNo, admissTimes);
 
@@ -728,13 +728,13 @@ public class XiangMuLuRuService {
 
     public ResultVo<List<ZyDetailCharge>> huoQuZhenShuKePiPei(String inpatientNo, Integer admissTimes, Integer ledgerSn, String chargeCodeMx, String execUnit, String orderNo, String startTime, String endTime, String riQiPaiXu) {
         execUnit = StringUtil.isBlank(execUnit) ? null : execUnit;
-        List<ZyDetailCharge> zhenShuFeiYong = dao.weiGuiZhenShuPiPei(publicServer.getInpatientNo(inpatientNo), admissTimes, ledgerSn, publicServer.getInfantFlag(inpatientNo), chargeCodeMx, execUnit, orderNo, startTime, endTime, riQiPaiXu);
+        List<ZyDetailCharge> zhenShuFeiYong = dao.weiGuiZhenShuPiPei(publicServer.getInpatientNo(inpatientNo), admissTimes, ledgerSn, PublicServer.getInfantFlag(inpatientNo), chargeCodeMx, execUnit, orderNo, startTime, endTime, riQiPaiXu);
 
         if (ListUtil.isBlank(zhenShuFeiYong)) {
-            zhenShuFeiYong.addAll(dao.weiGuiZhenShuPiPei(publicServer.getInpatientNo(inpatientNo), admissTimes, ledgerSn, publicServer.getInfantFlag(inpatientNo), chargeCodeMx, null, orderNo, startTime, endTime, riQiPaiXu));
+            zhenShuFeiYong.addAll(dao.weiGuiZhenShuPiPei(publicServer.getInpatientNo(inpatientNo), admissTimes, ledgerSn, PublicServer.getInfantFlag(inpatientNo), chargeCodeMx, null, orderNo, startTime, endTime, riQiPaiXu));
         }
         if (ListUtil.isBlank(zhenShuFeiYong)) {
-            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "没有查询到该负数费用的对应正数。", dao.genJuBianMaChaZhaoZhenShuFeiYong(publicServer.getInpatientNo(inpatientNo), admissTimes, ledgerSn, publicServer.getInfantFlag(inpatientNo), chargeCodeMx, startTime, endTime, riQiPaiXu));
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "没有查询到该负数费用的对应正数。", dao.genJuBianMaChaZhaoZhenShuFeiYong(publicServer.getInpatientNo(inpatientNo), admissTimes, ledgerSn, PublicServer.getInfantFlag(inpatientNo), chargeCodeMx, startTime, endTime, riQiPaiXu));
         }
         List<ZyDetailCharge> yuEr = dao.tuiFeiYuEr1(publicServer.getInpatientNo(inpatientNo), admissTimes, ledgerSn, chargeCodeMx, execUnit);
         Map<String, ZyDetailCharge> yuErPiPei = new HashMap<>();
@@ -762,7 +762,7 @@ public class XiangMuLuRuService {
     @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> caiFenPiPei(ZyDetailCharge zyDetailCharge) {
         String inpatientNo = publicServer.getInpatientNo(zyDetailCharge.getInpatientNo());
-        Integer infantFlag = publicServer.getInfantFlag(zyDetailCharge.getInpatientNo());
+        Integer infantFlag = PublicServer.getInfantFlag(zyDetailCharge.getInpatientNo());
         if (ListUtil.isBlank(zyDetailCharge.getList())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择数据。");
         }

+ 4 - 4
src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -275,13 +275,13 @@ public class SetlListUpldService {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "结算id为空");
         }
         // 特级护理
-        setlinfoUpld.setSpgaNurscareDays(nursingDays(dao.teJiHuLi(publicServer.getInpatientNo(patNo), times, ledgerSn, publicServer.getInfantFlag(patNo))));
+        setlinfoUpld.setSpgaNurscareDays(nursingDays(dao.teJiHuLi(publicServer.getInpatientNo(patNo), times, ledgerSn, PublicServer.getInfantFlag(patNo))));
         // 一级护理
-        setlinfoUpld.setLv1NurscareDays(nursingDays(dao.yiJiHuLi(publicServer.getInpatientNo(patNo), times, ledgerSn, publicServer.getInfantFlag(patNo))));
+        setlinfoUpld.setLv1NurscareDays(nursingDays(dao.yiJiHuLi(publicServer.getInpatientNo(patNo), times, ledgerSn, PublicServer.getInfantFlag(patNo))));
         // 二级护理
-        setlinfoUpld.setScdNurscareDays(nursingDays(dao.erJiHuLi(publicServer.getInpatientNo(patNo), times, ledgerSn, publicServer.getInfantFlag(patNo))));
+        setlinfoUpld.setScdNurscareDays(nursingDays(dao.erJiHuLi(publicServer.getInpatientNo(patNo), times, ledgerSn, PublicServer.getInfantFlag(patNo))));
         // 三级护理
-        setlinfoUpld.setLv3NurscareDays(nursingDays(dao.sanJiHuLi(publicServer.getInpatientNo(patNo), times, ledgerSn, publicServer.getInfantFlag(patNo))));
+        setlinfoUpld.setLv3NurscareDays(nursingDays(dao.sanJiHuLi(publicServer.getInpatientNo(patNo), times, ledgerSn, PublicServer.getInfantFlag(patNo))));
         GetDropdownBox getDropdownBox = dao.userInfo(TokenUtil.getTokenUserId());
         // 医疗机构填报人
         setlinfoUpld.setMedinsFillPsn(getDropdownBox.getName());

+ 1 - 1
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/CaoYaoYiZhuServer.java

@@ -151,7 +151,7 @@ public class CaoYaoYiZhuServer {
         param.setOrderNo(BigDecimal.valueOf(publicServer.getActOrderNo()));
         dao.chaRuCaoYaoYiZhu(param, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), huanZheXinXi.getSmallDept());
         dao.chaRuCaoYaoXiangQing(param.getList(), param.getOrderNo());
-        dao.chaRuYiZhu(param, "草药医嘱:" + param.getOrderName() + param.getQuantity() + "剂", huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), huanZheXinXi.getSmallDept(), publicServer.getInfantFlag(huanZheXinXi.getInpatientNo()));
+        dao.chaRuYiZhu(param, "草药医嘱:" + param.getOrderName() + param.getQuantity() + "剂", huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), huanZheXinXi.getSmallDept(), PublicServer.getInfantFlag(huanZheXinXi.getInpatientNo()));
         List<String> content = new ArrayList<>();
         content.add(String.format("草药医嘱名:<span style='color:#409eff'>【%s】</span><br>" +
                 "剂数:<span style='color:#409eff'>【%s】</span><br>" +

+ 1 - 1
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingServer.java

@@ -428,7 +428,7 @@ public class JianYanJianChaShenQingServer {
         dao.chaRuShenQing(param.getList(), param.getInpatientNo(), param.getName(), param.getAge() + "岁", param.getAdmissTimes(),
                 param.getBedNo(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getReqType());
         dao.chaRuShenQingYiZhu(param.getList(), param.getInpatientNo(), param.getAdmissTimes(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(),
-                publicServer.getInfantFlag(param.getInpatientNo()));
+                PublicServer.getInfantFlag(param.getInpatientNo()));
 
         publicServer.faSongXiaoXi(huanZheXinXi, content, param.getReqType().equals("2") ? "新增检查" : "新增检验", TokenUtil.getTokenUserId());
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);

+ 1 - 1
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/ShouShuShenQingServer.java

@@ -134,7 +134,7 @@ public class ShouShuShenQingServer {
                 huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), userCode, param.getBedNo(), param.getAdmissWard());
 
         if (ListUtil.notBlank(shenChengYiZhu)) {
-            dao.chaRuYiZhu(shenChengYiZhu, publicServer.getInfantFlag(param.getInpatientNo()),
+            dao.chaRuYiZhu(shenChengYiZhu, PublicServer.getInfantFlag(param.getInpatientNo()),
                     userCode, param.getInpatientNo(), param.getAdmissTimes(), huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getExecDept());
         }
         publicServer.faSongXiaoXi(huanZheXinXi, content, "新增手术", TokenUtil.getTokenUserId());

+ 48 - 12
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -65,6 +65,10 @@ public class YiZhuLuRuServer {
         this.redisLikeService = redisLikeService;
     }
 
+    public ResultVo<String> getOrderNo() {
+        return ResultVoUtil.success(new BigDecimal(publicServer.getActOrderNo()).stripTrailingZeros().toPlainString());
+    }
+
     public ResultVo<List<Patient>> getMyPatient() {
         return ResultVoUtil.success(dao.getMyPatient(TokenUtil.getTokenUserId()));
     }
@@ -216,6 +220,46 @@ public class YiZhuLuRuServer {
         return ResultVoUtil.success(list);
     }
 
+    public ResultVo<List<XinZhenYzActOrder>> getParentOrders(String patNo, String times) {
+        return ResultVoUtil.success(dao.getParentOrders(patNo, times));
+    }
+
+
+    public ResultVo<Map<String, Object>> enterOrders(XinZhenYiZhu param) {
+        String userCode = TokenUtil.getTokenUserId();
+        // 获取医生开药品的权限
+        Integer doctorLevel = dao.huoQuYiShenDengJi(userCode);
+        XinZhenYiZhu huanZheXinXi = dao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
+        XinZhenYzActOrder data = param.getData();
+        // 设置医嘱号
+        data.setActOrderNo(new BigDecimal(param.getActOrderNo()));
+        // 设置 药房
+        data.setGroupNo(publicServer.getGroupNo());
+        // 药品的 code
+        Set<String> yaoPingCode = new HashSet<>();
+        // 项目的 code
+        Set<String> xiangMuCode = new HashSet<>();
+        if (ITEM.equals(data.getSerial())) {
+            xiangMuCode.add(data.getOrderCode());
+        } else {
+            yaoPingCode.add(data.getOrderCode().trim() + data.getSerial().trim());
+        }
+        Map<String, XinZhenYzActOrder> drug = getDrugInformation(yaoPingCode, huanZheXinXi.getSmallDept());
+        Map<String, List<XinZhenYzActOrder>> project = getProjectInformation(xiangMuCode);
+        Map<String, Object> errorMessageMap = checkData(data, drug, project, huanZheXinXi, doctorLevel);
+        log.info("添加医嘱:{}", JSON.toJSONString(param));
+        log.info("错误信息:{}", JSON.toJSONString(errorMessageMap));
+        if (!errorMessageMap.isEmpty()) {
+            errorMessageMap.put("data", data);
+            return ResultVoUtil.fail(ExceptionEnum.ERROR_MESSAGE, "请修改有错误的医嘱。", errorMessageMap);
+        }
+
+        dao.deleteOrderNo(param.getActOrderNo(), param.getInpatientNo(), param.getAdmissTimes());
+        dao.insertEntryOrder(huanZheXinXi, param.getData(), userCode);
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "添加成功.");
+    }
+
+
     /**
      * 获取某一个费用的详细信息
      *
@@ -394,7 +438,7 @@ public class YiZhuLuRuServer {
             throw new BizException(ExceptionEnum.LOGICAL_ERROR, "没有查询到患者的在院信息。");
         }
         // 设置婴儿标志
-        huanZheXinXi.setInfantFlag(publicServer.getInfantFlag(huanZheXinXi.getInpatientNo()));
+        huanZheXinXi.setInfantFlag(PublicServer.getInfantFlag(huanZheXinXi.getInpatientNo()));
 
         boolean isThereAnyErrorMessage = false;
         Map<String, Object> map = new HashMap<>();
@@ -459,7 +503,7 @@ public class YiZhuLuRuServer {
         }
         String groupNo = publicServer.getGroupNo();
         sendAMessageToTheNurse(param, inputCode, huanZheXinXi, groupNo);
-        dao.chaRuYiZhu(huanZheXinXi.getInpatientNo(), huanZheXinXi.getAdmissTimes(), inputCode, huanZheXinXi.getInfantFlag(), huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), huanZheXinXi.getReferPhysician(), param.getList());
+//        dao.chaRuYiZhu(huanZheXinXi.getInpatientNo(), huanZheXinXi.getAdmissTimes(), inputCode, huanZheXinXi.getInfantFlag(), huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), huanZheXinXi.getReferPhysician(), param.getList());
         return ResultVoUtil.success(map);
     }
 
@@ -525,17 +569,9 @@ public class YiZhuLuRuServer {
             return;
         }
         if (StringUtil.notBlank(feiYongXinXi.getDrugWeightUnit()) && item.getDoseUnit().trim().equals(feiYongXinXi.getDrugWeightUnit().trim())) {
-            if (BigUtils.bigXiaoYu(item.getDose(), feiYongXinXi.getDrugWeight())) {
-                item.setDrugOcc(BigDecimal.valueOf(1));
-            } else {
-                item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getDrugWeight(), 2));
-            }
+            item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getDrugWeight(), 2));
         } else if (StringUtil.notBlank(feiYongXinXi.getDrugVolUnit()) && item.getDoseUnit().trim().equals(feiYongXinXi.getDrugVolUnit())) {
-            if (BigUtils.bigXiaoYu(item.getDose(), feiYongXinXi.getDrugVolume())) {
-                item.setDrugOcc(BigDecimal.valueOf(1));
-            } else {
-                item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getDrugVolume(), 2));
-            }
+            item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getDrugVolume(), 2));
         } else if (StringUtil.notBlank(feiYongXinXi.getPackUnit()) && item.getDoseUnit().trim().equals(feiYongXinXi.getPackUnit())) {
             if (new BigDecimal(item.getDose().intValue()).compareTo(item.getDose()) != 0) {
                 错误信息.add("已经是最小单位了请不要带小数点");