Merge branch 'master' into 淮海科技

src/main/java/thyyxxk/webserver/controller/inpatient/xmlr/XiangMuLuRuController.java

@@ -66,12 +66,9 @@ public class XiangMuLuRuController {
         return service.getChargeCode(pyCode);
     }
 
-    @GetMapping("/getMuBan")
-    public ResultVo<IPage<ZyDetailCharge>> getMuBan(@RequestParam("deptCode") String deptCode,
-                                                    @RequestParam("currentPage") long currentPage,
-                                                    @RequestParam("pageSize") long pageSize,
-                                                    @RequestParam("total") long total) {
-        return service.getMuBan(deptCode, currentPage, pageSize, total);
+    @PostMapping("/getMuBan")
+    public ResultVo<IPage<ZyDetailCharge>> getMuBan(@RequestBody XiangMuLuRuService.SearchMb params) {
+        return service.getMuBan(params);
     }
 
     @GetMapping("/getMuBanXinXi")
@@ -92,8 +89,9 @@ public class XiangMuLuRuController {
 
     @GetMapping("/queryXiangMu")
     public ResultVo<List<ZyDetailCharge>> queryXiangMu(@RequestParam("pyCode") String pyCode,
-                                                       @RequestParam("xiangMuHuoYaoPinFlag") Integer xiangMuHuoYaoPinFlag) {
-        return service.queryXiangMu(pyCode, xiangMuHuoYaoPinFlag);
+                                                       @RequestParam("xiangMuHuoYaoPinFlag") Integer xiangMuHuoYaoPinFlag,
+                                                       @RequestParam("yfType") String yfType) {
+        return service.queryXiangMu(pyCode, xiangMuHuoYaoPinFlag, yfType);
     }
 
     @PostMapping("/xiangMuFeiYongShangChuan")
@@ -200,6 +198,5 @@ public class XiangMuLuRuController {
     }
 
 
-
 }
 

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

@@ -187,8 +187,12 @@ public class JianYanJianChaController {
 
     @PostMapping("/printListReqNo")
     @PassToken
-    private ResultVo<Object> printListReqNo(@RequestBody List<Integer> reqNo) {
+    public ResultVo<Object> printListReqNo(@RequestBody List<Integer> reqNo) {
         return server.printListReqNo(reqNo);
     }
 
+    @GetMapping("/buWeiShuJu")
+    public ResultVo<List<GetDropdownBox>> buWeiShuJu(String name) {
+        return server.buWeiShuJu(name);
+    }
 }

src/main/java/thyyxxk/webserver/dao/his/inpatient/ChargeListDao.java

@@ -47,7 +47,7 @@ public interface ChargeListDao {
             "select " +
             "code=case when isnull(nullif(serial,''),'00')='00' then " +
             "(select isnull(isnull(national_code_27,national_code),code)  from zd_charge_item d where d.code=charge_code_mx) else " +
-            "(select max(national_code) from yp_zd_dict d where d.code=charge_code_mx) end, " +
+            "(select isnull(max(national_code),max(code)) from yp_zd_dict d where d.code=charge_code_mx) end, " +
             "name=case when isnull(nullif(serial,''),'00')='00' then " +
             "(select name from zd_charge_item d where d.code=charge_code_mx) else " +
             "(select max(name) from yp_zd_dict d where d.code=charge_code_mx) end, " +
@@ -78,7 +78,7 @@ public interface ChargeListDao {
             "from (select * from ( " +
             "select code=case when isnull(nullif(a.serial,''),'00')='00' then " +
             "(select isnull(isnull(national_code_27,national_code),code) national_code from zd_charge_item d where d.code=charge_code_mx) else " +
-            "(select max(national_code) from yp_zd_dict d where d.code=charge_code_mx) end, " +
+            "(select isnull(max(national_code),max(code)) from yp_zd_dict d where d.code=charge_code_mx) end, " +
             "name=case when isnull(nullif(a.serial,''),'00')='00' then " +
             "(select name+isnull(comments,'') as name from zd_charge_item d where d.code=charge_code_mx) else " +
             "(select max(name) from yp_zd_dict d where d.code=charge_code_mx) end, " +

src/main/java/thyyxxk/webserver/dao/his/inpatient/xmlr/XiangMuLuRuDao.java

@@ -175,7 +175,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       national_code," +
             "       national_name," +
             "       descriptions," +
-            "       a.serial  " +
+            "       a.serial,a.group_no  " +
             "FROM zy_charge_pattern a, " +
             "     zd_charge_item b " +
             "WHERE (a.pattern_name =  #{patternName}) " +
@@ -196,7 +196,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       national_code," +
             "       national_name," +
             "       specification as descriptions," +
-            "       a.serial " +
+            "       a.serial,a.group_no " +
             "FROM zy_charge_pattern a, " +
             "     yp_base_yf b, " +
             "     yp_zd_dict d " +
@@ -278,8 +278,8 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "        a.serial=c.serial    and " +
             "        c.visible_flag_zy <> '1' and" +
             "        isnull(a.del_flag,0) = 0 and  " +
-            "        c.group_no='73'")
-    List<ZyDetailCharge> queryYaoPin(String pyCode);
+            "        c.group_no=#{yfType}")
+    List<ZyDetailCharge> queryYaoPin(String pyCode, String yfType);
 
     /**
      * 插入项目录入费用
@@ -327,7 +327,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "  cast(#{item.chargeFee,jdbcType=DECIMAL} / #{item.chargeAmount,jdbcType=DECIMAL} as decimal(14,5)) , " +
             // 数量
             "cast(#{item.chargeAmount,jdbcType=DECIMAL} as decimal(14,5)) " +
-            ", #{zyDetailCharge.zySerialNo} , #{item.serial} , '73' ,'1' )" +
+            ", #{zyDetailCharge.zySerialNo} , #{item.serial} , #{item.groupNo} ,'1' )" +
             "</foreach>" +
             "</script>")
     void shenQingYaoPing(@Param("zyDetailCharge") ZyDetailCharge zyDetailCharge,

src/main/java/thyyxxk/webserver/dao/his/medicine/YpInDetlDao.java

@@ -37,13 +37,9 @@ public interface YpInDetlDao extends BaseMapper<YpInDetlVo> {
             " order by de.in_docu_no desc, de.in_seri ")
     List<YpInDetlVo> selectYpInDetlVoList(@Param(Constants.WRAPPER) QueryWrapper<?> qw);
 
-    @Select(" select * from yp_in_detl where confirm_flag = '1' and buy_amt > 0 and rept_no = #{reptNo} and manu_no = #{manuNo} ")
+    @Select(" select top 1 * from yp_in_detl where confirm_flag = '1' and buy_amt > 0 and rept_no = #{reptNo} and manu_no = #{manuNo} ")
     YpInDetlVo selectYpInDetlListByNo(@Param("reptNo") String reptNo, @Param("manuNo") String manuNo);
 
-    @Select(" select * from yp_in_detl where confirm_flag = '1' and buy_amt > 0  and manu_no = #{manuNo} ")
-    YpInDetlVo selectYpInDetlListByNo(@Param("manuNo") String manuNo);
-
-
     @Select(" select convert(varchar(100), d.in_date, 20) as inDate, rtrim(d.in_docu_no) as inDocuNo, rtrim(d.rept_no) as reptNo, " +
             "   d.confirm_flag, d.in_type, d.group_no, rtrim(d.charge_code) as chargeCode, d.serial, d.in_seri, d.buy_amt, d.buy_price, " +
             "   convert(varchar(100), d.producing_date, 20) as producingDate, convert(varchar(100), d.eff_date, 23) as effDate, " +

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

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.mapping.ResultSetType;
-import org.apache.ibatis.session.ResultHandler;
 import thyyxxk.webserver.entity.casefrontsheet.YshHzRecord;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.*;
@@ -33,7 +31,7 @@ public interface JianYanJianChaDao {
 
     @Select("select order_name,req_no,act_order_no, " +
             "start_time,inpatient_no,admiss_times,receive_flag," +
-            "patient_uid " +
+            "patient_uid,inspect_stuff_name = (select rtrim(name) from ysh_zd_part_code where code = inspect_stuff) " +
             "from ysh_yj_req with (NOLOCK) " +
             " ${ew.customSqlSegment} ")
     List<YshYjReq> huoQuJianChaShenQingV2(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
@@ -79,7 +77,13 @@ public interface JianYanJianChaDao {
             "                         confirm_time,\n" +
             "                         confirm_id,\n" +
             "                         quantity,\n" +
-            "    inspect_stuff_name = (select rtrim(name) from jy_zd_sample with (NOLOCK) where code = inspect_stuff),\n" +
+            "                          case\n" +
+            "                          when req_type = '3'\n" +
+            "                              then (select rtrim(name) from ysh_zd_part_code where code = inspect_stuff)\n" +
+            "                          else\n" +
+            "                              (select rtrim(name)\n" +
+            "                               from jy_zd_sample with (NOLOCK)\n" +
+            "                               where code = inspect_stuff) end                                     as inspect_stuff_name,\n" +
             "    req_dept_name      = (select rtrim(name) from zd_unit_code where code = req_dept)," +
             "  req_ward_name      = (select rtrim(name) from zd_unit_code where code = req_ward),\n" +
             "    req_doctor_name    = (select rtrim(name) from a_employee_mi where code = req_doctor),\n" +
@@ -374,11 +378,12 @@ public interface JianYanJianChaDao {
             "group by a.code, a.name ")
     IPage<JcZdClass> jianYanFenLei(IPage<JcZdClass> page);
 
-    @Select("select rtrim(code) as code,name from jy_zd_sample with (NOLOCK) " +
-            "where (name like #{name} " +
+    @Select("select rtrim(code) as code,name from ${tableName} with (NOLOCK) " +
+            "where isnull(del_flag, '0') = '0' and (name like #{name} " +
             "    or py_code like #{name} " +
             "    or code like #{name} or d_code like #{name} )")
-    List<GetDropdownBox> biaoBenLeiXing(String name);
+    List<GetDropdownBox> biaoBenOrBuWei(String name, String tableName);
+
 
     @Select("select * " +
             "from ysh_yj_req with (NOLOCK) where req_no = #{reqNo} and inpatient_no = #{patNo} and admiss_times = #{times}")

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/jianyanjiancha/vo/PrintYshReqVo.java

@@ -41,9 +41,15 @@ public class PrintYshReqVo {
 
     private List<Item> items;
 
+
+
     @Data
     public static class Item {
         private Integer reqNo;
+        /**
+         * 检查的部位或者检验的标本
+         */
+        private String inspectStuffName;
         private String itemName;
     }
 }

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

@@ -323,18 +323,40 @@ public class XiangMuLuRuService {
     }
 
 
+    @Data
+    public static class SearchMb {
+        private String searchName;
+        private long total = 0;
+        private long currentPage;
+        private long pageSize;
+    }
+
+
     /**
      * 获取模板
      *
-     * @param deptCode 根据科室搜索
      * @return 返回模板
      */
-    public ResultVo<IPage<ZyDetailCharge>> getMuBan(String deptCode, long currentPage, long pageSize, long total) {
-        IPage<ZyDetailCharge> page = new Page<>(currentPage, pageSize, total == 0);
+    public ResultVo<IPage<ZyDetailCharge>> getMuBan(SearchMb params) {
+        IPage<ZyDetailCharge> page = new Page<>(params.getCurrentPage(), params.getPageSize(), params.getTotal() == 0);
         QueryWrapper<?> qw = new QueryWrapper<>();
+        UserInfo userInfo = userCache.getUserInfoByToken();
         qw.ne("isnull(pattern_name,'')", "''");
         if (publicServer.noNeedRule()) {
-            qw.eq("op_dept", deptCode);
+            qw.eq("op_dept", userInfo.getDeptCode());
+        }
+        if (StrUtil.isNotBlank(params.getSearchName())) {
+            qw.and(
+                    queryWrapper -> {
+                        queryWrapper.like("pattern_name", params.getSearchName())
+                                .or()
+                                .like("py_code", params.getSearchName().toUpperCase())
+                                .or()
+                                .like("d_code", params.getSearchName().toUpperCase())
+
+                        ;
+                    }
+            );
         }
         dao.getMuBan(page, qw);
         return ResultVoUtil.success(page);
@@ -376,11 +398,11 @@ public class XiangMuLuRuService {
      * @param xiangMuHuoYaoPinFlag 判断是查询项目还是药品 0 - 项目 1- 药品
      * @return 返回项目
      */
-    public ResultVo<List<ZyDetailCharge>> queryXiangMu(String pyCode, Integer xiangMuHuoYaoPinFlag) {
+    public ResultVo<List<ZyDetailCharge>> queryXiangMu(String pyCode, Integer xiangMuHuoYaoPinFlag, String yfType) {
         if (xiangMuHuoYaoPinFlag == 0) {
             return ResultVoUtil.success(dao.queryXiangMu("%" + pyCode.toUpperCase() + "%"));
         }
-        return ResultVoUtil.success(dao.queryYaoPin("%" + pyCode.toUpperCase() + "%"));
+        return ResultVoUtil.success(dao.queryYaoPin("%" + pyCode.toUpperCase() + "%", yfType));
     }
 
     /**
@@ -506,10 +528,13 @@ public class XiangMuLuRuService {
             if (zyDetailCharge.getSelfFlag() == null) {
                 zyDetailCharge.setSelfFlag("0");
             }
+            if (StrUtil.isBlank(zyDetailCharge.getGroupNo())) {
+                zyDetailCharge.setGroupNo("73");
+            }
         }
         Integer ledgerSn = publicServer.getLedgerSn(param.getInpatientNo(), param.getAdmissTimes());
         // 在此处 插入费用
-        dao. chaRuFeiYong(param, param.getList(),
+        dao.chaRuFeiYong(param, param.getList(),
                 infantFlag,
                 ledgerSn,
                 DateUtil.formatDatetime(param.getChargeDate(),

src/main/java/thyyxxk/webserver/service/medicaladvice/nursing/NursingManagementService.java

@@ -614,7 +614,10 @@ public class NursingManagementService {
 
     public ResultVo<String> saveYzTemperature(YzTemperatureVO query) {
         AssertUtil.isnotBlank(query.getRecTime(),"时间不能为空!");
-        checkHlTwMb(query.getPulse1(), query.getTemperature1());
+        if(!"死亡".equals(query.getScdSpecialtext())){
+            checkHlTwMb(query.getPulse1(), query.getTemperature1());
+        }
+
         //先查询是否存在
         query.setRecTimeStr(DateUtil.format(query.getRecTime(),"HH:mm:ss"));
         query.setToStringRecTime(query.getRecTimeStr());

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

@@ -35,7 +35,6 @@ import thyyxxk.webserver.utils.*;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
-import java.text.DateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -177,6 +176,7 @@ public class JianYanJianChaShenQingService {
                 PrintYshReqVo.Item voItem = new PrintYshReqVo.Item();
                 voItem.setItemName(i.getOrderName());
                 voItem.setReqNo(i.getReqNo());
+                voItem.setInspectStuffName(i.getInspectStuffName());
                 if (vo.getItems() == null) {
                     vo.setItems(new ArrayList<>());
                 }
@@ -676,7 +676,11 @@ public class JianYanJianChaShenQingService {
     }
 
     public ResultVo<List<GetDropdownBox>> biaoBenShuJu(String name) {
-        return ResultVoUtil.success(dao.biaoBenLeiXing(StringUtil.isContainChinese(name)));
+        return ResultVoUtil.success(dao.biaoBenOrBuWei(StringUtil.isContainChinese(name), "jy_zd_sample"));
+    }
+
+    public ResultVo<List<GetDropdownBox>> buWeiShuJu(String name) {
+        return ResultVoUtil.success(dao.biaoBenOrBuWei(StringUtil.isContainChinese(name), "ysh_zd_part_code"));
     }
 
     public ResultVo<ViewInspectionItemDetailsVo> viewInspectionItemDetails(String orderCode, Boolean isCheck) {