解决婴儿数据元报错问题

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

@@ -2,14 +2,12 @@ package thyyxxk.webserver.service.dictionary;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-import org.aspectj.apache.bcel.classfile.Code;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.dao.his.dictionary.EmrDataMaintenanceDao;
-import thyyxxk.webserver.dao.his.zhuyuanyisheng.EmrPatientDao;
+import thyyxxk.webserver.dao.his.zhuyuanyisheng.emr.EmrPatientDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.zhuyuanyisheng.emr.EmrDataElement;
 import thyyxxk.webserver.entity.zhuyuanyisheng.emr.EmrDataExtract;
@@ -35,9 +33,10 @@ public class EmrDataMaintenanceServer {
     }
 
     private static String keyParameterSubstitution(String sqlSentence, String patNo, Integer times) {
-        sqlSentence = sqlSentence.replaceAll("\\$\\{PAT_NO}", " '" + patNo + "' ");
-        sqlSentence = sqlSentence.replaceAll("\\$\\{TIMES}", " " + times + " ");
-        return sqlSentence;
+        Map<String, String> map = new HashMap<>();
+        map.put("PAT_NO", "'" + patNo + "'");
+        map.put("TIMES", times.toString());
+        return StringUtil.replaceElementValue(sqlSentence, map);
     }
 
     private static void createObject(Map<String, List<Map<String, Object>>> groupMap,