xiaochan il y a 1 an
Parent
commit
5349190199

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/PublicDao.java

@@ -244,7 +244,7 @@ public interface PublicDao {
     Integer caoYaoDanHaot();
 
     @Update("update yz_sequence set page_no = #{newId} where page_no = #{oldId} ")
-    int genXingCaoYaoDanHao(Integer newId, Integer oldId);
+    int genXingCaoYaoDanHao(@Param("newId") Integer newId, @Param("oldId") Integer oldId);
 
     @Select("select card_no from crb_config")
     Integer oldCrbNo();

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/emr/EmrPatientDao.java

@@ -161,7 +161,7 @@ public interface EmrPatientDao {
     List<String> getDocumentIdByPatietn(String patNo, int times, String categoryCode);
 
     @Select("select data_element from emr_data_element where pat_no = #{patNo} and times = #{times} ")
-    String getEmrPatientData(String patNo, int times);
+    String getEmrPatientData(@Param("patNo") String patNo,@Param("times") int times);
 
 
     @Select("select top 1 rtrim(a.name)                                                                                          as xm, " +

+ 1 - 2
src/main/resources/application-prod.yml

@@ -86,7 +86,6 @@ forest:
     socketCenter: http://172.16.32.160:8707/socketApi
 
 execute-scheduled: true
-environment: his
 
 triage-notify-url: http://172.16.32.160:8082/triage/roomScreen/pushMsg
 si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter
@@ -98,4 +97,4 @@ si-mz-fee-url: http://172.16.32.166:1100/mzFee
 si-injury-fee-url: http://172.16.32.163:2100/siInjury
 si-injury-systm-url: http://172.16.32.163:2000/siInjury
 thmz-api-url: http://172.16.32.160:81/thmz/api/v1
-appletThmzUrl: http://172.16.32.160:81/thmz
+appletThmzUrl: http://172.16.32.160:81/thmz

+ 1 - 3
src/main/resources/application.yml

@@ -15,7 +15,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: his
+      primary: dev
       strict: false
       datasource:
         his:
@@ -108,8 +108,6 @@ si-injury-fee-url: http://172.16.32.163:2100/siInjury
 #si-injury-systm-url: http://172.16.32.163:2000/siInjury
 thmz-api-url: http://172.16.32.160:81/thmz/api/v1
 
-environment: dev
-
 #测试环境
 #si-api-url: http://10.93.30.130:20001/isp-api/powercsb/1101
 #si-access-key: Zgs5jfxaKb86XbCuUzLK9EhFjiQfHR1vydaPzp

+ 0 - 39
src/main/resources/script-1.0.dtd

@@ -1,39 +0,0 @@
-<!ELEMENT script (#PCDATA | trim | where | set | foreach | choose | if | notblank)*>
-
-
-        <!ELEMENT trim (#PCDATA | trim | where | set | foreach | choose | if | notblank)*>
-        <!ATTLIST trim
-                prefix CDATA #IMPLIED
-                prefixOverrides CDATA #IMPLIED
-                suffix CDATA #IMPLIED
-                suffixOverrides CDATA #IMPLIED
-                >
-        <!ELEMENT where (#PCDATA | trim | where | set | foreach | choose | if | notblank)*>
-        <!ELEMENT set (#PCDATA | trim | where | set | foreach | choose | if | notblank)*>
-
-        <!ELEMENT foreach (#PCDATA | trim | where | set | foreach | choose | if | notblank)*>
-        <!ATTLIST foreach
-                collection CDATA #REQUIRED
-                item CDATA #IMPLIED
-                index CDATA #IMPLIED
-                open CDATA #IMPLIED
-                close CDATA #IMPLIED
-                separator CDATA #IMPLIED
-                >
-
-        <!ELEMENT choose (when* , otherwise?)>
-        <!ELEMENT when (#PCDATA | trim | where | set | foreach | choose | if | notblank)*>
-        <!ATTLIST when
-                test CDATA #REQUIRED
-                >
-        <!ELEMENT otherwise (#PCDATA | trim | where | set | foreach | choose | if | notblank)*>
-
-        <!ELEMENT if (#PCDATA | trim | where | set | foreach | choose | if | notblank)*>
-        <!ATTLIST if
-                test CDATA #REQUIRED
-                >
-
-        <!ELEMENT notblank (#PCDATA | trim | where | set | foreach | choose | if | notblank)*>
-        <!ATTLIST notblank
-                test CDATA #REQUIRED
-                >