化验检查代码更新

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -158,6 +158,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/sendHomeOperation").permitAll()
                 .antMatchers("/qc/data/sendCrisis").permitAll()
                 .antMatchers("/qc/data/deleteFlag").permitAll()
+                .antMatchers("/qc/data/sendPacsInfos").permitAll()
+                .antMatchers("/qc/data/sendLisInfos").permitAll()
+
                 .antMatchers("/qc/data/placeFile").permitAll()
                 .antMatchers("/qc/data/sendLisResults").permitAll()
                 .antMatchers("/qc/data/sendPacsResults").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -205,6 +205,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/placeFile", request)
                 || matchers("/qc/data/sendLisResults", request)
                 || matchers("/qc/data/sendPacsResults", request)
+                || matchers("/qc/data/sendPacsInfos", request)
+                || matchers("/qc/data/sendLisInfos", request)
                 || matchers("/qc/data/getColumnZhAndCh", request)
                 || matchers("/qc/data/analyseRec", request)
                 || matchers("/qc/data/hisDataDeal", request)

src/main/java/com/diagbot/facade/data/AMedLisResultFacade.java

@@ -77,28 +77,12 @@ public class AMedLisResultFacade extends MedLisResultServiceImpl {
     }
 
     public void execute(List<MedLisResult> medLisResultList){
-        List<MedLisResult> addE = Lists.newLinkedList();
-        List<MedLisResult> updateE = Lists.newLinkedList();
         if (medLisResultList != null && medLisResultList.size() > 0) {
             medLisResultList.stream().forEach(s -> {
-                MedLisResult medLisResult = this.getOne(new QueryWrapper<MedLisResult>()
-                        .eq("rep_no", s.getRepNo())
-                        .eq("hospital_id", s.getHospitalId()), false);
-                if (medLisResult != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
                     s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
+                    this.save(s);
             });
         }
-        if(addE.size()>0){
-            this.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            this.baseMapper.updateBatchByKey(updateE);
-        }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){

src/main/java/com/diagbot/facade/data/AMedPacsResultFacade.java

@@ -90,13 +90,11 @@ public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
                     updateE.add(s);
                 } else {
                     s.setGmtCreate(new Date());
+                    this.save(s);
                     addE.add(s);
                 }
             });
         }
-        if(addE.size()>0){
-            this.saveBatch(addE);
-        }
         if(updateE.size()>0){
             this.baseMapper.updateBatchByKey(updateE);
         }

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -281,7 +281,9 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             executeMrRecord(aMrContentVO.getRecords());
 
             aMrContentVO.getRecords().stream().forEach(s -> {
-                String sql ="select * from v_jkcdss_bl_bingli  where RECID= "+s.getRecId()+" ";
+                String tableName =s.getRecId().substring(0,2);
+                String recId=s.getRecId().substring(3);
+                String sql ="select * from v_jkcdss_bl_binglijlnr where RECID= '"+recId+" ' and tableName = '"+tableName+"'";
                 List<MedicalRecordContent> medicalRecordContent =tzDBConn.getMedicalRecordContent(sql);
                     //更新文书详情
                     aMedicalRecordContentFacade.execute(medicalRecordContent);
@@ -371,7 +373,6 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
                     Long modeId = initModeId(s);
 
-
                     if (modeId == Long.valueOf("0")) {
                         //新增类型到监测表中
                         QcAbnormal qcAbnormal = new QcAbnormal();
@@ -483,6 +484,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         }else if (modeId==Long.valueOf("5")){
             if (medicalRecord.getRecTitle().contains("死亡")){
                 modeId=Long.valueOf("24");
+            }if (medicalRecord.getRecTitle().contains("社区管理")){
+                modeId=Long.valueOf("53");
             }
         }
         return modeId;

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: mrqc-sys
   profiles:
-    active: dev
+    active: local
   main:
     allow-bean-definition-overriding: true
 

src/main/resources/jdbc.properties

@@ -15,10 +15,10 @@ jdbc.password=jkcdss
 #jdbc.password=zjlt@2020
 
 #\u6570\u636e\u670d\u52a1\u6a21\u5f0f
-remote.address.ver=http://192.18.101.207:2030/index.html
-remote.address.hor=http://192.18.101.207:2030/indexHorizontal.html
+remote.address.ver=http://192.16.1.104:2030/index.html
+remote.address.hor=http://192.16.1.104:2030/indexHorizontal.html
 
-process.qc.url=http://192.168.100.157:1489/index.html
+process.qc.url=http://192.16.1.104:1489/index.html
 
 #his\u65b9\u60a3\u8005\u63a5\u53e3\u5730\u5740
 his.patient.url=