写注释

pom.xml

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

src/main/java/thyyxxk/webserver/dao/his/querydata/QueryDrugsAndProjectsDao.java

@@ -215,8 +215,8 @@ public interface QueryDrugsAndProjectsDao {
      * 查询药品或者项目名称
      *
      * @param tableName 表名
-     * @param pyCode    拼音码
-     * @return 首字母
+     * @param pyCode    首字母 以及 项目编码
+     * @return 返回list
      */
     @Select("select rtrim(code) code,rtrim(name) name from ${tableName} where py_code like #{pyCode} or code like #{pyCode}")
     List<GetDropdownBox> chaXunXiangMuhuoYaoPinCode(@Param("tableName") String tableName,

src/main/java/thyyxxk/webserver/dao/his/yibao/TransferInOfExpensesDao.java

@@ -206,14 +206,9 @@ public interface TransferInOfExpensesDao {
      * @return 返回多个项目的名称
      */
     @Select("select * from (" +
-            "select code,rtrim(name)name from zd_charge_item where py_code like #{pyCode} " +
+            "select code,rtrim(name)name from zd_charge_item where py_code like #{pyCode} or code like #{pyCode} " +
             "union " +
-            "select code,rtrim(name)name from yp_zd_dict where py_code like #{pyCode}" +
+            "select code,rtrim(name)name from yp_zd_dict where py_code like #{pyCode} or code like #{pyCode} " +
             ") temp")
     List<GetDropdownBox> queryEntryName(@Param("pyCode") String pyCode);
-
-
-//    9498.58,-7498.58,420.00
-
-
 }

src/main/java/thyyxxk/webserver/dao/his/yibao/XiangMuLuRuDao.java

@@ -118,7 +118,7 @@ public interface XiangMuLuRuDao {
      * @param pyCode 拼音编码
      * @return 获取项目的名称和code
      */
-    @Select("select code,name from  zd_charge_item where py_code like #{pyCode}")
+    @Select("select code,name from  zd_charge_item where py_code like #{pyCode} or code like #{pyCode}")
     List<GetDropdownBox> getChargeCode(String pyCode);
 
     /**
@@ -399,7 +399,7 @@ public interface XiangMuLuRuDao {
             "         isnull(a.in_out_flag,'') <> '1' and " +
             "         a.class_code not in ('D','H') and " +
             "         a.exec_unit*=b.code and " +
-            "         a.py_code like #{pyCode}")
+            "         a.py_code like #{pyCode} or a.code like #{pyCode}")
     List<ZyDetailCharge> queryXiangMu(String pyCode);
 
     /**

src/main/java/thyyxxk/webserver/service/casefrontsheet/HuiZhenShenQingService.java

@@ -45,7 +45,7 @@ public class HuiZhenShenQingService {
      * @return 返回科室
      */
     public ResultVo<List<GetDropdownBox>> queryDept(String code) {
-        return ResultVoUtil.success(dao.getZdUnitCode(code.toUpperCase() + "%"));
+        return ResultVoUtil.success(dao.getZdUnitCode("%" + code.toUpperCase() + "%"));
     }
 
     /**

src/main/java/thyyxxk/webserver/service/datamodify/InOrOutOfWarehouseService.java

@@ -78,13 +78,13 @@ public class InOrOutOfWarehouseService {
     public ResultVo<List<GetDropdownBox>> queryCode(String pyCode, Integer flag) {
         if (flag == 1) {
             //供应商
-            return ResultVoUtil.success(dao.queryCode("yp_zd_supply", pyCode.toUpperCase() + "%"));
+            return ResultVoUtil.success(dao.queryCode("yp_zd_supply", "%" + pyCode.toUpperCase() + "%"));
         } else if (flag == 2) {
             //采购员
-            return ResultVoUtil.success(dao.queryCode("a_employee_mi", pyCode.toUpperCase() + "%"));
+            return ResultVoUtil.success(dao.queryCode("a_employee_mi", "%" + pyCode.toUpperCase() + "%"));
         } else if (flag == 3) {
             //生产厂家
-            return ResultVoUtil.success(dao.queryCode("yp_zd_manufactory", pyCode.toUpperCase() + "%"));
+            return ResultVoUtil.success(dao.queryCode("yp_zd_manufactory", "%" + pyCode.toUpperCase() + "%"));
         }
         return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
     }

src/main/java/thyyxxk/webserver/service/querydata/QueryDrugsAndProjectsService.java

@@ -10,7 +10,6 @@ import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
 import thyyxxk.webserver.constants.GetDateFormat;
 import thyyxxk.webserver.dao.his.querydata.QueryDrugsAndProjectsDao;
-import thyyxxk.webserver.dao.his.reports.IllegalChargesAnalysisDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.querydata.QueryDrugsAndProjects;
@@ -40,12 +39,10 @@ public class QueryDrugsAndProjectsService {
 
     private final QueryDrugsAndProjectsDao dao;
 
-    private final IllegalChargesAnalysisDao illegalChargesAnalysisDao;
 
     @Autowired
-    public QueryDrugsAndProjectsService(QueryDrugsAndProjectsDao dao, IllegalChargesAnalysisDao illegalChargesAnalysisDao) {
+    public QueryDrugsAndProjectsService(QueryDrugsAndProjectsDao dao) {
         this.dao = dao;
-        this.illegalChargesAnalysisDao = illegalChargesAnalysisDao;
     }
 
     /**
@@ -67,10 +64,11 @@ public class QueryDrugsAndProjectsService {
      */
     public ResultVo<List<QueryDrugsAndProjects>> queryProjects(QueryDrugsAndProjects param) {
         List<QueryDrugsAndProjects> list = dao.queryProjects(param);
-        if (list.size() > 0) {
-            return ResultVoUtil.success(list);
+        if (list.isEmpty()) {
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }
-        return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
+        return ResultVoUtil.success(list);
+
     }
 
     /**
@@ -168,12 +166,11 @@ public class QueryDrugsAndProjectsService {
      * @return 返回符合的数据
      */
     public ResultVo<List<QueryDrugsAndProjects>> queryDrugs(QueryDrugsAndProjects param) {
-        log.info("查询药品 --> {}", JSON.toJSONString(param));
         List<QueryDrugsAndProjects> list = dao.queryDrugs(param);
-        if (list.size() > 0) {
-            return ResultVoUtil.success(list);
+        if (list.isEmpty()) {
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }
-        return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
+        return ResultVoUtil.success(list);
     }
 
     /**
@@ -184,14 +181,13 @@ public class QueryDrugsAndProjectsService {
      */
     public ResultVo<IPage<QueryDrugsAndProjects>> chaKanYaoPing(QueryDrugsAndProjects param) {
         IPage<QueryDrugsAndProjects> page = new Page<>(1, 50);
-        log.info("查询yp ");
         return ResultVoUtil.success(dao.chaKanYaoPinShiYong(page, param.getStartTime(), param.getEndTime(), param.getChargeCode()));
     }
 
     /**
      * 在字典中查询 药品或者项目的 code 以及 name
      *
-     * @param pyCode 拼音编码
+     * @param pyCode 拼音编码 或者 项目编码
      * @param flag   1：项目 2：药品
      * @return 返回list
      */
@@ -208,9 +204,9 @@ public class QueryDrugsAndProjectsService {
 
     public ResultVo<List<IllegalChargeData>> chaXunJianYanJianCha(IllegalChargeTemplate param) {
         List<IllegalChargeData> list = dao.chaXunJianYanJianCha(param.getStart(), param.getEnd(), param.getResponces());
-        if (list.size() > 0) {
-            return ResultVoUtil.success(list);
+        if (list.isEmpty()) {
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }
-        return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
+        return ResultVoUtil.success(list);
     }
 }

src/main/java/thyyxxk/webserver/service/yibao/TransferInOfExpensesService.java

@@ -103,19 +103,15 @@ public class TransferInOfExpensesService {
         if (page.getTotal() > 0 || list.size() > 0) {
             BigDecimal sum = new BigDecimal(0);
             for (ZyDetailCharge zyDetailCharge : sumList) {
+                if (zyDetailCharge.getChargeFee().signum() == -1) {
+                    zyDetailCharge.getChargeFee().negate();
+                }
                 sum = sum.add(zyDetailCharge.getChargeFee().multiply(zyDetailCharge.getChargeAmount()));
-
             }
             map.put("data", list);
             map.put("total", page.getTotal());
             map.put("sum", sum);
             return ResultVoUtil.success(map);
-        } else if (sumList.size() > 0) {
-            StringBuffer stringBuffer = new StringBuffer();
-            for (ZyDetailCharge zyDetailCharge : sumList) {
-                stringBuffer.append(zyDetailCharge.getChargeCode());
-            }
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("该患者存在急门诊费用，无法显示，原因对应项目编码没有维护：编码如下{%s}", stringBuffer));
         }
         return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
     }
@@ -176,6 +172,6 @@ public class TransferInOfExpensesService {
      * @return 返回多个项目的名称
      */
     public ResultVo<List<GetDropdownBox>> queryEntryName(String pyCode) {
-        return ResultVoUtil.success(dao.queryEntryName(pyCode.toUpperCase() + "%"));
+        return ResultVoUtil.success(dao.queryEntryName("%" + pyCode.toUpperCase() + "%"));
     }
 }

src/main/java/thyyxxk/webserver/service/yibao/XiangMuLuRuService.java

@@ -73,7 +73,7 @@ public class XiangMuLuRuService {
      * @return 获取项目code
      */
     public ResultVo<List<GetDropdownBox>> getChargeCode(String pyCode) {
-        return ResultVoUtil.success(dao.getChargeCode(pyCode.toUpperCase() + "%"));
+        return ResultVoUtil.success(dao.getChargeCode("%" + pyCode.toUpperCase() + "%"));
     }
 
     /**

src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: his
+      primary: dev
       strict: false
       datasource:
         his: