已经匹配好的工伤目录添加有效期的显示

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

@@ -1,6 +1,7 @@
 package thyyxxk.webserver.dao.his.dictionary;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -19,7 +20,7 @@ import java.util.List;
 public interface NationalMatchDao {
 
     @Select("select a.code,a.serial,a.new_name as name,type=#{type},${upldFlagColumn} as uploadedFlag, " +
-            "${codeColumn} as nationalCode,${nameColumn} as nationalName, " +
+            "${codeColumn} as nationalCode,${nameColumn} as nationalName,${statement} " +
             "aaz231 as injuryUniqueId,ake003 as catalogueType, bke215 as fundType, " +
             "unit=(select name from yp_zd_unit where yp_zd_unit.code=a.dosage_unit), " +
             "dosage=(select name from yp_zd_dosage where yp_zd_dosage.code=a.dosage), " +
@@ -30,7 +31,7 @@ public interface NationalMatchDao {
             "where isnull(${statusColumn},0)=#{status} 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}")
-    IPage<StandardLocalItem> selectLocalMedicines(IPage<StandardLocalItem> iPage,
+    Page<StandardLocalItem> selectLocalMedicines(Page<StandardLocalItem> iPage,
                                                   @Param("code") String code,
                                                   @Param("name") String name,
                                                   @Param("type") int type,
@@ -39,10 +40,11 @@ public interface NationalMatchDao {
                                                   @Param("statusColumn") String statusColumn,
                                                   @Param("codeColumn") String codeColumn,
                                                   @Param("nameColumn") String nameColumn,
-                                                  @Param("upldFlagColumn") String upldFlagColumn);
+                                                  @Param("upldFlagColumn") String upldFlagColumn,
+                                                  @Param("statement") String statement);
 
     @Select("select a.code,a.serial,a.new_name as name,type=#{type},${upldFlagColumn} as uploadedFlag, " +
-            "${codeColumn} as nationalCode,${nameColumn} as nationalName, " +
+            "${codeColumn} as nationalCode,${nameColumn} as nationalName,${statement} " +
             "aaz231 as injuryUniqueId,ake003 as catalogueType, bke215 as fundType, " +
             "unit=(select name from yp_zd_unit where yp_zd_unit.code=a.dosage_unit), " +
             "dosage=(select name from yp_zd_dosage where yp_zd_dosage.code=a.dosage), " +
@@ -53,7 +55,7 @@ public interface NationalMatchDao {
             "where isnull(${statusColumn},0)=#{status} 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} ")
-    IPage<StandardLocalItem> selectLocalHerbals(IPage<StandardLocalItem> iPage,
+    Page<StandardLocalItem> selectLocalHerbals(Page<StandardLocalItem> iPage,
                                                   @Param("code") String code,
                                                   @Param("name") String name,
                                                   @Param("type") int type,
@@ -62,15 +64,16 @@ public interface NationalMatchDao {
                                                   @Param("statusColumn") String statusColumn,
                                                   @Param("codeColumn") String codeColumn,
                                                   @Param("nameColumn") String nameColumn,
-                                                  @Param("upldFlagColumn") String upldFlagColumn);
+                                                  @Param("upldFlagColumn") String upldFlagColumn,
+                                                @Param("statement") String statement);
 
     @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, " +
+            "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 " +
             "where isnull(${statusColumn},0)=#{status} and isnull(del_flag,0)=#{delFlag} and " +
             "class_code='J' and code like #{code} and name like #{name}")
-    IPage<StandardLocalItem> selectLocalSupplies(IPage<StandardLocalItem> iPage,
+    Page<StandardLocalItem> selectLocalSupplies(Page<StandardLocalItem> iPage,
                                                  @Param("code") String code,
                                                  @Param("name") String name,
                                                  @Param("type") int type,
@@ -79,16 +82,17 @@ public interface NationalMatchDao {
                                                  @Param("statusColumn") String statusColumn,
                                                  @Param("codeColumn") String codeColumn,
                                                  @Param("nameColumn") String nameColumn,
-                                                 @Param("upldFlagColumn") String upldFlagColumn);
+                                                 @Param("upldFlagColumn") String upldFlagColumn,
+                                                 @Param("statement") String statement);
 
     @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, " +
+            "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 " +
             "class_code!='J' and code like #{code} and name like #{name}")
-    IPage<StandardLocalItem> selectLocalServices(IPage<StandardLocalItem> iPage,
+    Page<StandardLocalItem> selectLocalServices(Page<StandardLocalItem> iPage,
                                                  @Param("code") String code,
                                                  @Param("name") String name,
                                                  @Param("type") int type,
@@ -97,7 +101,8 @@ public interface NationalMatchDao {
                                                  @Param("statusColumn") String statusColumn,
                                                  @Param("codeColumn") String codeColumn,
                                                  @Param("nameColumn") String nameColumn,
-                                                 @Param("upldFlagColumn") String upldFlagColumn);
+                                                 @Param("upldFlagColumn") String upldFlagColumn,
+                                                 @Param("statement") String statement);
 
     @Update("update zd_charge_item set new_name=name where new_name is null")
     void asyncNewNameForServices();

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

@@ -42,7 +42,7 @@ public class NationalMatchService {
 
     public ResultVo<Map<String, Object>> selectLocalItems(QueryParam param) {
         log.info("是否导出：{}", param.getExport());
-        IPage<StandardLocalItem> iPage = param.getExport() ? new Page<>(1, -1) :
+        Page<StandardLocalItem> iPage = param.getExport() ? new Page<>(1, -1) :
                 new Page<>(param.getCurrentPage(), param.getPageSize());
         String code = param.getCode();
         code = StringUtil.isBlank(code) ? "%%" : code.trim().toUpperCase();
@@ -52,18 +52,23 @@ public class NationalMatchService {
         String codeColumn = param.getYbType() == 1 ? "national_code" : "ake001";
         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.getType() == NationalMatchType.MEDICINE) {
             iPage = dao.selectLocalMedicines(iPage, code, name, param.getType(), param.getDelFlag(),
-                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn);
+                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement);
         } else if(param.getType() == NationalMatchType.HERBAL) {
             iPage = dao.selectLocalHerbals(iPage, code, name, param.getType(), param.getDelFlag(),
-                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn);
+                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement);
         } else if (param.getType() == NationalMatchType.SERVICE) {
             iPage = dao.selectLocalServices(iPage, code, name, param.getType(), param.getDelFlag(),
-                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn);
+                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement);
         } else {
             iPage = dao.selectLocalSupplies(iPage, code, name, param.getType(), param.getDelFlag(),
-                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn);
+                    param.getStatus(), statusColumn, codeColumn, nameColumn, upldFlagColumn, statement);
         }
         if (iPage.getRecords().size() == 0) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有符合条件的数据。");