优化代码

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

@@ -131,11 +131,6 @@ public class YizhuLuRuController {
         return server.huoQuZhuYuanPinLv(code);
     }
 
-    @GetMapping("/getFrequencyCount")
-    public ResultVo<JSONObject> getFrequencyCount(String code) {
-        return server.getFrequencyCount(code);
-    }
-
     @GetMapping("/huoQuGeiYaoFangShi")
     @PassToken
     public ResultVo<List<GetDropdownBox>> huoQuGeiYaoFangShi(String code) {
@@ -148,7 +143,7 @@ public class YizhuLuRuController {
     }
 
     @PostMapping("/singleDataCheck")
-    public ResultVo<Object> singleDataCheck(@RequestBody XinZhenYiZhu param) {
+    public ResultVo<Map<String, Object>> singleDataCheck(@RequestBody XinZhenYiZhu param) {
         return server.singleDataCheck(param);
     }
 

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

@@ -17,7 +17,6 @@ import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.*;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -26,7 +25,7 @@ import java.util.Set;
  * </p>
  *
  * @author xc
- * @date 2022-01-04 17:00
+ * &#064;date  2022-01-04 17:00
  */
 @Mapper
 public interface YiZhuLuRuDao {
@@ -489,9 +488,6 @@ public interface YiZhuLuRuDao {
                                         Integer times,
                                         List<String> list);
 
-    @Select("select count(1) from zy_actpatient where inpatient_no = #{patNo} and admiss_times = #{times}")
-    int inTheHospital(String patNo, Integer times);
-
     @Update("<script>" +
             "update zy_detail_charge " +
             "set ori_detail_sn = -1 " +
@@ -535,10 +531,10 @@ public interface YiZhuLuRuDao {
 
 
     /**
-     * 获取医生下面的病区
+     *
      *
      * @param deptCode 科室编码
-     * @return
+     * @return 获取医生下面的病区
      */
     @Select("select dept " +
             "from zd_dept_all with (NOLOCK) " +
@@ -547,10 +543,10 @@ public interface YiZhuLuRuDao {
     List<String> getTheDoctorSDepartment(String deptCode);
 
     /**
-     * 获取已经确认收费的医嘱
+     *
      *
      * @param orderNo 医嘱号
-     * @return
+     * @return 获取已经确认收费的医嘱
      */
     @Select("select count(*) " +
             "from yz_zy_patient_fee with (NOLOCK) " +
@@ -909,16 +905,6 @@ public interface YiZhuLuRuDao {
     UserInfo selectedUserInfoByCode(String code);
 
 
-    @Select("select day_800, day_830, day_900, " +
-            "       day_930, day_1000, day_1030, day_1100, day_1130, day_1200, day_1230, day_1300, day_1330, " +
-            "       day_1400, day_1430, day_1500, day_1530, day_1600, day_1630, day_1700, day_1730, " +
-            "       day_1800, day_1830, day_1900, day_1930, day_2000, day_2030, day_2100, day_2130, " +
-            "       day_2200, day_2230, day_2300, day_2330, day_2400, day_030, day_100, day_130, day_200, " +
-            "       day_230, day_300, day_330, day_400, day_430, day_500, day_530, day_600, day_630, " +
-            "       day_700, day_730 " +
-            "from yz_order_frequency where code = #{code}")
-    Map<String, Short> numberOfTimesADay(String code);
-
     @Select("select rtrim(supply_code) code,rtrim(supply_name) name " +
             "from yz_supply_type with (NOLOCK) " +
             "where ps_flag in ('1', '0')")
@@ -1325,24 +1311,6 @@ public interface YiZhuLuRuDao {
     YzOrderPattern yuanLaiDeMuBanBianMa(@Param("patternName") String patternName,
                                         @Param("inputId") String inputId);
 
-
-    @Select("select top 1 * " +
-            "from yz_OrderPattern with (NOLOCK) " +
-            "where pattern_code = #{patternCode} " +
-            "  and input_id = #{inputId}" +
-            "  and input_type <> 4 ")
-    YzOrderPattern getDataAccordingToTemplateCode(@Param("patternCode") String patternCode,
-                                                  @Param("inputId") String input);
-
-    @Select("select pattern_code," +
-            "       rtrim(input_type) input_type," +
-            "       input_id  " +
-            "from yz_OrderPattern with (NOLOCK) " +
-            "where pattern_name = #{patternName} " +
-            "and input_type not in ('3','4') ")
-    YzOrderPattern gongGongMuBan(@Param("patternName") String patternName);
-
-
     @Delete("<script>" +
             "delete yz_OrderPattern " +
             "where pattern_code = #{patternCode}; " +

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

@@ -299,8 +299,6 @@ public class YiZhuLuRuServer {
 
         Repel repel = checkData.getRepel();
 
-        log.info("数据：{}", JSON.toJSONString(repel));
-
         if (repel != null) {
             int count = dao.thereAreUnexecutedOrders(param.getInpatientNo(), param.getAdmissTimes(), repel.getOrderNo());
             if (count > 0) {
@@ -865,13 +863,15 @@ public class YiZhuLuRuServer {
      * @param param 模板数据
      * @return 返回提示信息
      */
-    public ResultVo<Object> singleDataCheck(XinZhenYiZhu param) {
+    public ResultVo<Map<String, Object>> singleDataCheck(XinZhenYiZhu param) {
         param.getList().get(0).setActOrderNo(new BigDecimal(param.getList().get(0).getId()));
         YiZhuCheckData checkData = new YiZhuCheckData(dao);
         checkData.init(param.getList(), null);
         Map<String, Object> errorMessage = checkData.startCheck(null);
-        Object map = errorMessage.get(param.getList().get(0).getId());
-        return ResultVoUtil.success(map);
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("data", param.getList().get(0));
+        returnMap.put("message", errorMessage.get(param.getList().get(0).getId()) );
+        return ResultVoUtil.success(returnMap);
     }
 
 
@@ -931,44 +931,6 @@ public class YiZhuLuRuServer {
         return ResultVoUtil.success();
     }
 
-
-    private void calculateDrugAmount(XinZhenYzActOrder item, XinZhenYzActOrder feiYongXinXi) {
-        if (feiYongXinXi == null) {
-            return;
-        }
-        item.setDrugWeight(feiYongXinXi.getDrugWeight());
-        item.setDrugWeightUnit(feiYongXinXi.getDrugWeightUnit());
-
-        item.setDrugVolume(feiYongXinXi.getDrugVolume());
-        item.setDrugVolUnit(feiYongXinXi.getDrugWeightUnit());
-
-        if (StringUtil.notBlank(feiYongXinXi.getDrugWeightUnit()) && item.getDoseUnit().trim().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())) {
-            item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getDrugVolume(), 2));
-        } else if (StringUtil.notBlank(feiYongXinXi.getPackUnit()) && item.getDoseUnit().trim().equals(feiYongXinXi.getPackUnit())) {
-            item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getPackSize(), 2));
-        }
-    }
-
-
-    public ResultVo<JSONObject> getFrequencyCount(String code) {
-        // 计算出院带药的领量
-        Map<String, Short> numberOfTimesADay = dao.numberOfTimesADay(code);
-        int times = 0;
-        for (Map.Entry<String, Short> entry : numberOfTimesADay.entrySet()) {
-            if (entry.getValue() != null) {
-                times += entry.getValue();
-            }
-        }
-        JSONObject js = new JSONObject();
-        // 一天几次
-        js.put("count", times);
-        js.put("code", code);
-        return ResultVoUtil.success(js);
-    }
-
-
     /***
      * 获取项目信息
      * @param xiangMuCode 项目编码

src/main/java/thyyxxk/webserver/text/CallBack.java

@@ -1,6 +0,0 @@
-package thyyxxk.webserver.text;
-
-public interface CallBack {
-
-    void callback(String str);
-}

src/main/java/thyyxxk/webserver/text/Person.java

@@ -1,16 +0,0 @@
-package thyyxxk.webserver.text;
-
-
-public class Person implements CallBack {
-    @Override
-    public void callback(String str) {
-        System.out.println(str);
-    }
-
-
-    public void fun() {
-        for (int i = 0; i < 10; i++) {
-            callback("asd");
-        }
-    }
-}

src/main/java/thyyxxk/webserver/text/Text.java

@@ -1,11 +0,0 @@
-package thyyxxk.webserver.text;
-
-public class Text {
-
-    public static void main(String[] args) {
-        Person p = new Person();
-
-        p.fun();
-
-    }
-}