厦门接口

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

@@ -64,7 +64,8 @@ public class AStrBloodResultFacade extends StrBloodResultServiceImpl {
                 }
             }
             StrBloodResult strBloodResult =new StrBloodResult();
-            strBloodResult = (StrBloodResult) MapUtil.mapToObject(map, StrBloodResult.class);
+            AStrBloodResultVO aStrBloodResultVO = (AStrBloodResultVO) MapUtil.mapToObject(map, AStrBloodResultVO.class);
+            BeanUtils.copyProperties(aStrBloodResultVO,strBloodResult);
             BeanUtils.copyProperties(hisViewVos.get(0),strBloodResult);
             strBloodResult.setWholeData(JSON.toJSONString(wholeData));
 

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

@@ -67,7 +67,8 @@ public class AStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
                 }
             }
             StrBloodTransfusion strBloodTransfusion =new StrBloodTransfusion();
-            strBloodTransfusion = (StrBloodTransfusion) MapUtil.mapToObject(map, StrBloodTransfusion.class);
+            AStrBloodTransfusionVO aStrBloodTransfusionVO= (AStrBloodTransfusionVO) MapUtil.mapToObject(map, AStrBloodTransfusionVO.class);
+            BeanUtils.copyProperties(aStrBloodTransfusionVO,strBloodTransfusion);
             BeanUtils.copyProperties(hisViewVos.get(0),strBloodTransfusion);
             strBloodTransfusion.setWholeData(JSON.toJSONString(wholeData));
 

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

@@ -66,7 +66,8 @@ public class AStrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
                 }
             }
             StrConsultationNote strConsultationNote =new StrConsultationNote();
-            strConsultationNote = (StrConsultationNote) MapUtil.mapToObject(map, StrConsultationNote.class);
+            AStrConsultationNoteVO aStrConsultationNote = (AStrConsultationNoteVO) MapUtil.mapToObject(map, StrConsultationNote.class);
+            BeanUtils.copyProperties(aStrConsultationNote,strConsultationNote);
             BeanUtils.copyProperties(hisViewVos.get(0),strConsultationNote);
             strConsultationNote.setWholeData(JSON.toJSONString(wholeData));
 

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

@@ -64,7 +64,8 @@ public class AStrConsultationRecordFacade extends StrConsultationRecordServiceIm
                 }
             }
             StrConsultationRecord strConsultationRecord =new StrConsultationRecord();
-            strConsultationRecord = (StrConsultationRecord) MapUtil.mapToObject(map, StrConsultationRecord.class);
+            AStrConsultationRecordVO aStrConsultationRecordVO = (AStrConsultationRecordVO) MapUtil.mapToObject(map, AStrConsultationRecordVO.class);
+            BeanUtils.copyProperties(aStrConsultationRecordVO,strConsultationRecord);
             BeanUtils.copyProperties(hisViewVos.get(0),strConsultationRecord);
             strConsultationRecord.setWholeData(JSON.toJSONString(wholeData));
 

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

@@ -23,6 +23,7 @@ import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.FJStrAdmissionNoteVo;
 import com.diagbot.vo.data.HisViewVo;
+import org.bouncycastle.asn1.BERApplicationSpecific;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -69,7 +70,8 @@ public class AStrFirstRecordFacade extends StrFirstRecordServiceImpl {
                 }
             }
             StrFirstRecord strFirstRecord =new StrFirstRecord();
-            strFirstRecord = (StrFirstRecord) MapUtil.mapToObject(map, StrFirstRecord.class);
+            AStrFirstRecordVO aStrFirstRecordVO = (AStrFirstRecordVO) MapUtil.mapToObject(map, AStrFirstRecordVO.class);
+            BeanUtils.copyProperties(aStrFirstRecordVO,strFirstRecord);
             BeanUtils.copyProperties(hisViewVos.get(0),strFirstRecord);
             strFirstRecord.setWholeData(JSON.toJSONString(wholeData));
 

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

@@ -62,7 +62,8 @@ public class AStrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
                 }
             }
             StrPeriodConclusion strPeriodConclusion =new StrPeriodConclusion();
-            strPeriodConclusion = (StrPeriodConclusion) MapUtil.mapToObject(map, StrPeriodConclusion.class);
+            AStrPeriodConclusionVO  aStrPeriodConclusionVO = (AStrPeriodConclusionVO) MapUtil.mapToObject(map, AStrPeriodConclusionVO.class);
+            BeanUtils.copyProperties(aStrPeriodConclusionVO,strPeriodConclusion);
             BeanUtils.copyProperties(hisViewVos.get(0),strPeriodConclusion);
             strPeriodConclusion.setWholeData(JSON.toJSONString(wholeData));
 

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

@@ -67,7 +67,8 @@ public class AStrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
             }
 
             StrTransferInNote strTransferInNote =new StrTransferInNote();
-            strTransferInNote = (StrTransferInNote) MapUtil.mapToObject(map, StrTransferInNote.class);
+            AStrTransferInNoteVO aStrTransferInNoteVO = (AStrTransferInNoteVO) MapUtil.mapToObject(map, AStrTransferInNoteVO.class);
+            BeanUtils.copyProperties(aStrTransferInNoteVO,strTransferInNote);
             BeanUtils.copyProperties(hisViewVos.get(0),strTransferInNote);
             strTransferInNote.setWholeData(JSON.toJSONString(wholeData));
 

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

@@ -66,7 +66,8 @@ public class AStrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
                 }
             }
             StrTransferOutNote strTransferOutNote =new StrTransferOutNote();
-            strTransferOutNote = (StrTransferOutNote) MapUtil.mapToObject(map, StrTransferOutNote.class);
+            AStrTransferOutNoteVO  aStrTransferOutNoteVO = (AStrTransferOutNoteVO) MapUtil.mapToObject(map, AStrTransferOutNoteVO.class);
+            BeanUtils.copyProperties(aStrTransferOutNoteVO,strTransferOutNote);
             BeanUtils.copyProperties(hisViewVos.get(0),strTransferOutNote);
             strTransferOutNote.setWholeData(JSON.toJSONString(wholeData));
 

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

@@ -135,7 +135,8 @@ public class StructuralDataFacade {
      */
     public void  sendStructuralDataOld(StructuralDataVo structuralDataVo){
         try {
-            String sql ="select behospitalCode from med_behospital_info where to_char(behospitalDate,'yyyymmdd') >= '"+structuralDataVo.getBehospitalDate()+"'";
+            String sql ="select * from med_behospital_info t  where  t.behospitalDate >=to_date('"+structuralDataVo.getStartDate()
+                    + "','yyyymmdd') and t.behospitalDate <= to_date('"+structuralDataVo.getStopDate()+"','yyyymmdd')";
             List<String> strings =fjtzdbConnHarp.getBehospitalInfoDate(sql);
             strings.forEach(s->{
                 StructuralDataVo sData =new StructuralDataVo();

src/main/java/com/diagbot/vo/data/StructuralDataVo.java

@@ -26,9 +26,13 @@ public class StructuralDataVo {
     private Long hospitalId;
 
     /**
-     * 入院时间
+     * 开始时间
      */
-    private String behospitalDate;
+    private String startDate;
+    /**
+     * 结束时间
+     */
+    private String stopDate;
 
     /**
      * 所对应的模板

src/main/resources/application-local.yml

@@ -1,5 +1,5 @@
 server:
-  port: 5859
+  port: 5858
   max-http-header-size: 10MB
 
 hystrix: