优化住院医生

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>2</version>
+    <version>1</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

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

@@ -81,7 +81,7 @@ public class YizhuLuRuController {
     }
 
     @GetMapping("/huoQuYiZhuMuBan")
-    public ResultVo<IPage<yzOrderPattern>> huoQuYiZhuMuBan(@RequestParam("code") String code,
+    public ResultVo<IPage<YzOrderPattern>> huoQuYiZhuMuBan(@RequestParam("code") String code,
                                                            @RequestParam("deptCode") String deptCode,
                                                            @RequestParam("muBanLeiXing") Integer muBanLeiXing,
                                                            @RequestParam("currentPage") long currentPage,
@@ -95,7 +95,7 @@ public class YizhuLuRuController {
     }
 
     @PostMapping("/baoCunMuBan")
-    public ResultVo<String> baoCunMuBan(@RequestBody @Validated yzOrderPattern param) {
+    public ResultVo<String> baoCunMuBan(@RequestBody @Validated YzOrderPattern param) {
         return server.baoCunMuBan(param);
     }
 

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

@@ -305,6 +305,7 @@ public interface YiZhuLuRuDao {
             "   cast(isnull(NULLIF(kjyw_flag, ''), 0) as int) as kjyw_flag," +
             "   code as order_code,name as order_name ," +
             "   frequency as frequCode," +
+            "  (select isnull(rtrim(comm),'') from yz_order_frequency where yz_order_frequency.code = frequency) as frequCodeName," +
             "   supply_type as supply_code " +
             "from yp_zd_dict with (NOLOCK) " +
             "where  rtrim(code) + rtrim(serial) = #{code}  " +
@@ -515,7 +516,7 @@ public interface YiZhuLuRuDao {
             "</if>" +
             ") temp where row_number > (${currentPage} - 1) * 20" +
             "</script>")
-    List<yzOrderPattern> huoQuMuBan(@Param("code") String code,
+    List<YzOrderPattern> huoQuMuBan(@Param("code") String code,
                                     @Param("inputId") String inputId,
                                     @Param("deptCode") String deptCode,
                                     @Param("muBanLeiXing") Integer muBanLeiXing,
@@ -648,7 +649,7 @@ public interface YiZhuLuRuDao {
             "where pattern_name = #{patternName} " +
             "  and input_id = #{inputId}" +
             "  and input_type <> 4 ")
-    yzOrderPattern yuanLaiDeMuBanBianMa(@Param("patternName") String patternName,
+    YzOrderPattern yuanLaiDeMuBanBianMa(@Param("patternName") String patternName,
                                         @Param("inputId") String inputId);
 
     @Select("select pattern_code," +
@@ -656,7 +657,7 @@ public interface YiZhuLuRuDao {
             "from yz_OrderPattern with (NOLOCK) " +
             "where pattern_name = #{patternName} " +
             "and input_type not in ('3','4') ")
-    yzOrderPattern gongGongMuBan(@Param("patternName") String patternName);
+    YzOrderPattern gongGongMuBan(@Param("patternName") String patternName);
 
 
     @Delete("<script>" +
@@ -672,7 +673,7 @@ public interface YiZhuLuRuDao {
             "                        input_type, input_date, sort_no) " +
             "values (#{patternCode},#{patternName},#{pyCode},#{dCode},#{deptCode},#{deptCode},#{inputId},#{inputType}," +
             "getdate(),#{sortNo})")
-    void chaRuMuBan(yzOrderPattern param);
+    void chaRuMuBan(YzOrderPattern param);
 
 
     @Insert("<script>" +
@@ -739,7 +740,7 @@ public interface YiZhuLuRuDao {
     @Select("select * " +
             "from yz_OrderPattern with (NOLOCK) " +
             "where pattern_code = #{code}")
-    yzOrderPattern huoQuMuBanXinXi(@Param("code") String code);
+    YzOrderPattern huoQuMuBanXinXi(@Param("code") String code);
 
     @Update("update yz_OrderPattern " +
             "set pattern_name = #{patternName}, " +

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

@@ -69,6 +69,7 @@ public class YaoPinXinXi {
      * 默认给药方式
      */
     private String frequCode;
+    private String frequCodeName;
 
     /**
      * 默认给药方式

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/yzOrderPattern.java → src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/YzOrderPattern.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @date 2022-01-17 15:31
  */
 @Data
-public class yzOrderPattern {
+public class YzOrderPattern {
 
 
     /**

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

@@ -127,6 +127,7 @@ public class CaoYaoYiZhuServer {
 
     public ResultVo<String> cunMuBan(YzOrderPatternCy param) {
         log.info("插入模板草药模板：{}", JSON.toJSONString(param));
+
         dao.chaRuMuBan(param.getList(), param.getPatternName(), TokenUtil.getTokenUserId(),
                 PingYinUtils.pyShouZiMuDaXie(param.getPatternName()), PingYinUtils.getWBCode(param.getPatternName()),
                 param.getDeptCode());

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

@@ -549,9 +549,9 @@ public class YiZhuLuRuServer {
      * @param code 编码
      * @return 返回模板名称 list
      */
-    public ResultVo<IPage<yzOrderPattern>> huoQuYiZhuMuBan(String code, String deptCode, Integer muBanLeiXing,
+    public ResultVo<IPage<YzOrderPattern>> huoQuYiZhuMuBan(String code, String deptCode, Integer muBanLeiXing,
                                                            long currentPage, long total) {
-        IPage<yzOrderPattern> page = new Page<>();
+        IPage<YzOrderPattern> page = new Page<>();
         if (total == 0) {
             page.setTotal(dao.huoQuMuBanTotal(StringUtil.isContainChinese(code), TokenUtil.getTokenUserId(), deptCode, muBanLeiXing));
         }
@@ -591,8 +591,8 @@ public class YiZhuLuRuServer {
         return ResultVoUtil.success(tree);
     }
 
-    public ResultVo<String> baoCunMuBan(yzOrderPattern param) {
-        yzOrderPattern yzOrderPattern;
+    public ResultVo<String> baoCunMuBan(YzOrderPattern param) {
+        YzOrderPattern yzOrderPattern;
         if ("3".equals(param.getInputType())) {
             yzOrderPattern = dao.yuanLaiDeMuBanBianMa(param.getPatternName(), TokenUtil.getTokenUserId());
         } else {
@@ -604,6 +604,10 @@ public class YiZhuLuRuServer {
         } else if ("2".equals(param.getInputType()) && publicServer.noNeedRule(role, 38, 11)) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "您没有权限修改和删除科室模板。");
         }
+        if (null == yzOrderPattern){
+            yzOrderPattern = new YzOrderPattern();
+        }
+        log.info("data:{}",JSON.toJSONString(yzOrderPattern));
         String patternCode = yzOrderPattern.getPatternCode();
         if (StringUtil.notBlank(patternCode) && !param.getQingZhiTiHuan()) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "模板名重复。是否替换：【900】");
@@ -648,7 +652,7 @@ public class YiZhuLuRuServer {
         if (StringUtil.isBlank(patternCode)) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "项目编码为空。");
         }
-        yzOrderPattern yzOrderPattern = dao.huoQuMuBanXinXi(patternCode);
+        YzOrderPattern yzOrderPattern = dao.huoQuMuBanXinXi(patternCode);
         if (yzOrderPattern == null) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有查询到对应的模板信息。");
         }

src/main/resources/application.yml

@@ -73,7 +73,7 @@ si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
 
 execute-scheduled: false
 
-#logging:
-#  level:
-#    thyyxxk.webserver.dao: debug
+logging:
+  level:
+    thyyxxk.webserver.dao: debug