添加筛选条件

src/main/java/thyyxxk/webserver/dao/his/dictionary/NationalMatchDao.java

@@ -28,7 +28,7 @@ public interface NationalMatchDao {
             "factory=(select name from yp_zd_manufactory where yp_zd_manufactory.code=a.manu_code) " +
             "from yp_zd_dict a, (select max(serial) as serial,code from yp_zd_dict where isnull(visible_flag,0)=#{delFlag} " +
             "and isnull(del_flag,0)=#{delFlag} group by code) b,yp_base c " +
-            "where isnull(${statusColumn},0)=#{status} and a.code=b.code and a.serial=b.serial " +
+            "where isnull(${statusColumn},0)=#{status} ${uploadStatement} and a.code=b.code and a.serial=b.serial " +
             "and c.group_no=11 and a.code=c.charge_code and a.drug_kind in (select code from yp_zd_drug_kind where yp_type in (1,2)) " +
             "and a.code like #{code} and a.name like #{name}")
     Page<StandardLocalItem> selectLocalMedicines(Page<StandardLocalItem> iPage,
@@ -41,7 +41,8 @@ public interface NationalMatchDao {
                                                   @Param("codeColumn") String codeColumn,
                                                   @Param("nameColumn") String nameColumn,
                                                   @Param("upldFlagColumn") String upldFlagColumn,
-                                                  @Param("statement") String statement);
+                                                  @Param("statement") String statement,
+                                                  @Param("uploadStatement") String uploadStatement);
 
     @Select("select a.code,a.serial,a.new_name as name,type=#{type},${upldFlagColumn} as uploadedFlag, " +
             "${codeColumn} as nationalCode,${nameColumn} as nationalName,${statement} " +
@@ -52,7 +53,7 @@ public interface NationalMatchDao {
             "factory=(select name from yp_zd_manufactory where yp_zd_manufactory.code=a.manu_code) " +
             "from yp_zd_dict a, (select max(serial) as serial,code from yp_zd_dict where isnull(visible_flag,0)=#{delFlag} " +
             "and isnull(del_flag,0)=#{delFlag} group by code) b,yp_base c " +
-            "where isnull(${statusColumn},0)=#{status} and a.code=b.code and a.serial=b.serial " +
+            "where isnull(${statusColumn},0)=#{status} ${uploadStatement} and a.code=b.code and a.serial=b.serial " +
             "and c.group_no=22 and a.code=c.charge_code and a.drug_kind in ('0007','0003') " +
             "and a.code like #{code} and a.name like #{name} ")
     Page<StandardLocalItem> selectLocalHerbals(Page<StandardLocalItem> iPage,
@@ -65,13 +66,14 @@ public interface NationalMatchDao {
                                                   @Param("codeColumn") String codeColumn,
                                                   @Param("nameColumn") String nameColumn,
                                                   @Param("upldFlagColumn") String upldFlagColumn,
-                                                @Param("statement") String statement);
+                                                  @Param("statement") String statement,
+                                                  @Param("uploadStatement") String uploadStatement);
 
     @Select("select code,rtrim(name) as name,charge_unit as unit,type=#{type},discription,descriptions as specification," +
             "aaz231 as injuryUniqueId,ake003 as catalogueType, bke215 as fundType,${statement} " +
             "${codeColumn} as nationalCode,${nameColumn} as nationalName,${upldFlagColumn} as uploadedFlag, " +
             "yb_comment as factory from zd_charge_item a " +
-            "where isnull(${statusColumn},0)=#{status} and isnull(del_flag,0)=#{delFlag} and " +
+            "where isnull(${statusColumn},0)=#{status} ${uploadStatement} and isnull(del_flag,0)=#{delFlag} and " +
             "class_code='J' and code like #{code} and name like #{name}")
     Page<StandardLocalItem> selectLocalSupplies(Page<StandardLocalItem> iPage,
                                                  @Param("code") String code,
@@ -83,14 +85,15 @@ public interface NationalMatchDao {
                                                  @Param("codeColumn") String codeColumn,
                                                  @Param("nameColumn") String nameColumn,
                                                  @Param("upldFlagColumn") String upldFlagColumn,
-                                                 @Param("statement") String statement);
+                                                 @Param("statement") String statement,
+                                                 @Param("uploadStatement") String uploadStatement);
 
     @Select("select code,rtrim(name) as name,charge_unit as unit,type=#{type}, discription,specification,${upldFlagColumn} as uploadedFlag," +
             "${codeColumn} as nationalCode,${nameColumn} as nationalName,s_code as standardCode, charge_amount as price, " +
             "aaz231 as injuryUniqueId,ake003 as catalogueType, bke215 as fundType,${statement} " +
             "localName=(select b.local_medical_service_name from si_central_services b where b.national_code=a.national_code) " +
             "from zd_charge_item a " +
-            "where isnull(${statusColumn},0)=#{status} and isnull(del_flag,0)=#{delFlag} and " +
+            "where isnull(${statusColumn},0)=#{status} ${uploadStatement} and isnull(del_flag,0)=#{delFlag} and " +
             "class_code!='J' and code like #{code} and name like #{name}")
     Page<StandardLocalItem> selectLocalServices(Page<StandardLocalItem> iPage,
                                                  @Param("code") String code,
@@ -102,7 +105,8 @@ public interface NationalMatchDao {
                                                  @Param("codeColumn") String codeColumn,
                                                  @Param("nameColumn") String nameColumn,
                                                  @Param("upldFlagColumn") String upldFlagColumn,
-                                                 @Param("statement") String statement);
+                                                 @Param("statement") String statement,
+                                                 @Param("uploadStatement") String uploadStatement);
 
     @Update("update zd_charge_item set new_name=name where new_name is null")
     void asyncNewNameForServices();

src/main/java/thyyxxk/webserver/entity/nationalmatch/QueryParam.java

@@ -13,6 +13,7 @@ public class QueryParam {
     private Integer ybType;
     private Integer status;
     private Integer delFlag;
+    private Integer uploadFlag;
     private Integer type;
     private String code;
     private String name;

src/main/java/thyyxxk/webserver/service/dictionary/NationalMatchService.java

@@ -53,22 +53,26 @@ public class NationalMatchService {
         String nameColumn = param.getYbType() == 1 ? "national_name" : "ake002";
         String upldFlagColumn = param.getYbType() == 1 ? "uploaded_flag" : "injury_upload_flag";
         String statement = "";
-        if (param.getYbType() == 2) {
-            statement = "startTime=(select d.aae030 from t_industrial_injury_catalogue d where d.aaz231=a.aaz231 )," +
-                    "endTime=(select d.aae031 from t_industrial_injury_catalogue d where d.aaz231=a.aaz231), ";
+//        if (param.getYbType() == 2) {
+//            statement = "startTime=(select d.aae030 from t_industrial_injury_catalogue d where d.aaz231=a.aaz231 )," +
+//                    "endTime=(select d.aae031 from t_industrial_injury_catalogue d where d.aaz231=a.aaz231), ";
+//        }
+        String uploadStatement = "";
+        if (null != param.getUploadFlag()) {
+            uploadStatement = "and " + upldFlagColumn + "=" + param.getUploadFlag();
         }
         if (param.getType() == NationalMatchType.MEDICINE) {
             iPage = dao.selectLocalMedicines(iPage, code, name, param.getType(), param.getDelFlag(),
-                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement);
+                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement, uploadStatement);
         } else if(param.getType() == NationalMatchType.HERBAL) {
             iPage = dao.selectLocalHerbals(iPage, code, name, param.getType(), param.getDelFlag(),
-                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement);
+                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement, uploadStatement);
         } else if (param.getType() == NationalMatchType.SERVICE) {
             iPage = dao.selectLocalServices(iPage, code, name, param.getType(), param.getDelFlag(),
-                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement);
+                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement, uploadStatement);
         } else {
             iPage = dao.selectLocalSupplies(iPage, code, name, param.getType(), param.getDelFlag(),
-                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement);
+                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement, uploadStatement);
         }
         if (iPage.getRecords().isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有符合条件的数据。");