任务详情搜索条件无法使用

src/main/java/com/emr/controller/FontController.java

@@ -79,10 +79,6 @@ public class FontController {
      * */
     @RequestMapping("showRecordByPatientId")
     public String showRecordByPatientId(String userName, String assortIds, String patientId, Model model){
-       /* //判断各参数
-        if(StringUtils.isBlank(userName)){
-            return retrunErrorPage(model,"工号不能为空!");
-        }*/
         if(StringUtils.isBlank(assortIds)){
             return retrunErrorPage(model,"病案分类Id不能为空!");
         }
@@ -344,10 +340,11 @@ public class FontController {
                     assortList.add(detail.getSubassort());
                     //获取title
                     String title = detail.getTitle();
-                    if(StringUtils.isNotBlank(title) && detail.getTitle().contains(strTemp)){
+                    //2024/01/17contains改为equals 首次首次护理记录单包含首次护理但是AssortId不一样导致无法现实
+                    if(StringUtils.isNotBlank(title) && detail.getTitle().equals(strTemp)){
                         detailTemp = detail;
                     }
-                    if(StringUtils.isNotBlank(title) && detail.getTitle().contains(nurseTemp)){
+                    if(StringUtils.isNotBlank(title) && detail.getTitle().equals(nurseTemp)){
                         nurseDetailVoTemp = detail;
                     }
                 }

src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java

@@ -367,14 +367,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                     if (archiveMasterVo.getCallBackStatus().equals("")) {
                         sql = "SELECT FISZH FROM  V_JSWZH_EMR_CALLBACK  WHERE JZH='" + inpNo + "'";
                     }
-                    try {
-                        String select = OracleConnect.select(sql);
-                        masterVo.setHisStatic(select);
-//                        String hisStatic = masterVo.getHisStatic();
-                    } catch (Exception e) {
-                        ExceptionPrintUtil.printException(e);
-                        e.printStackTrace();
-                    }
+//                    try {
+//                        String select = OracleConnect.select(sql);
+//                        masterVo.setHisStatic(select);
+////                        String hisStatic = masterVo.getHisStatic();
+//                    } catch (Exception e) {
+//                        ExceptionPrintUtil.printException(e);
+//                        e.printStackTrace();
+//                    }
                     if (StringUtils.isNotBlank(archivestate)) {
                         //转换中文状态
                         boolean numeric = isNumeric(archivestate);

src/main/resources/config/config.properties

@@ -2,12 +2,12 @@
 #POWER_IP = localhost
 #POWER_PORT = 8081
 
-#POWER_IP = localhost
-#POWER_PORT = 8081
+POWER_IP = localhost
+POWER_PORT = 8081
 
 
-POWER_IP = 200.100.104.40
-POWER_PORT = 8081
+#POWER_IP = 200.100.104.40
+#POWER_PORT = 8081
 
 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
 POWER_URLHEAD = http://${POWER_IP}:${POWER_PORT}/power

src/main/resources/config/jdbc.properties

@@ -5,20 +5,20 @@
 ##\u6570\u636E\u5E93\u5BC6\u7801
 #dataBasePassword=docus702
 #
-##\u6570\u636E\u5E93IP
-#dataBaseIp=localhost
-##\u6570\u636E\u5E93\u540D\u79F0
-#dataBaseName=gm_record
-##\u6570\u636E\u5E93\u5BC6\u7801
-#dataBasePassword=admin123
-
-
 #\u6570\u636E\u5E93IP
-dataBaseIp=db.docus.cn
+dataBaseIp=localhost
 #\u6570\u636E\u5E93\u540D\u79F0
-dataBaseName=emr_record
+dataBaseName=gm_record
 #\u6570\u636E\u5E93\u5BC6\u7801
-dataBasePassword=docus@702
+dataBasePassword=admin123
+
+
+##\u6570\u636E\u5E93IP
+#dataBaseIp=db.docus.cn
+##\u6570\u636E\u5E93\u540D\u79F0
+#dataBaseName=emr_record
+##\u6570\u636E\u5E93\u5BC6\u7801
+#dataBasePassword=docus@702
 
 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName}