化验辅检

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

@@ -114,19 +114,21 @@ public class StructuralOldDataFacade {
         try {
             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);
+            List<StructuralDataVo> strings =fjtzdbConnHarp.getBehospitalInfoDate(sql);
             strings.forEach(s->{
                 StructuralDataVo sData =new StructuralDataVo();
                 if (null!=structuralDataVo.getModeId()){
-                    sData.setBehospitalCode(s);
+                    sData.setBehospitalCode(s.getBehospitalCode());
+                    sData.setPatientId(s.getPatientId());
                     sData.setModeId(structuralDataVo.getModeId());
                     executeOld(sData);
                 }else {
                     for (int i = 0; i < 65; i++) {
                         String tableName = TableNameEnum.getName(i);
                         if (null != tableName) {
-                            sData.setBehospitalCode(s);
+                            sData.setBehospitalCode(s.getBehospitalCode());
                             sData.setModeId(String.valueOf(i));
+                            sData.setPatientId(s.getPatientId());
                             executeOld(sData);
                         }
                     }
@@ -141,10 +143,10 @@ public class StructuralOldDataFacade {
      * 终末质控，单个病人来导入数据
      * @param behospitalCode
      */
-    public void  sendOnebehospitalCode(List<String> behospitalCode){
-        behospitalCode.forEach(s->{
+    public void  sendOnebehospitalCode(String behospitalCode,String patientId){
             StructuralDataVo sData =new StructuralDataVo();
-            sData.setBehospitalCode(s);
+            sData.setBehospitalCode(behospitalCode);
+            sData.setPatientId(patientId);
             for (int i = 0; i <65 ; i++) {
                 String tableName=TableNameEnum.getName(i);
                 if (null!=tableName){
@@ -152,7 +154,6 @@ public class StructuralOldDataFacade {
                     executeOld(sData);
                 }
             }
-        });
     }
 
 

src/main/java/com/diagbot/util/FJTZDBConnHarp.java

@@ -4,6 +4,7 @@ import com.diagbot.entity.*;
 import com.diagbot.vo.data.FJStrAdmissionNoteVo;
 import com.diagbot.vo.data.HisHomePageVO;
 import com.diagbot.vo.data.HisViewVo;
+import com.diagbot.vo.data.StructuralDataVo;
 import com.google.common.collect.Lists;
 
 import java.sql.*;
@@ -206,14 +207,16 @@ public class FJTZDBConnHarp {
 	}
 
 
-	public List<String> getBehospitalInfoDate(String sql) {
-		List<String> strings=Lists.newLinkedList();
+	public List<StructuralDataVo> getBehospitalInfoDate(String sql) {
+		List<StructuralDataVo> strings=Lists.newLinkedList();
 		try {
 			FJTZDBConnHarp dbconn=new FJTZDBConnHarp();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				String s=(rs.getString("behospitalCode"));//病人住院ID
-				strings.add(s);
+				StructuralDataVo structuralDataVo =new StructuralDataVo();
+				structuralDataVo.setBehospitalCode(rs.getString("behospitalCode"));//病人住院ID
+				structuralDataVo.setPatientId(rs.getString("patientId"));
+				strings.add(structuralDataVo);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();

src/main/java/com/diagbot/web/DataController.java

@@ -93,8 +93,8 @@ public class DataController {
     @ApiOperation(value = "{历史病例导入单个病人}")
     @PostMapping("/sendStructuralOneOld")
     @SysLogger("sendStructuralOneOld")
-    public void sendStructuralOneOld(@Valid @RequestBody List<String> behospitalCode){
-        sendOnebehospitalCode.sendOnebehospitalCode(behospitalCode);
+    public void sendStructuralOneOld(@Valid @RequestBody StructuralDataVo structuralDataVo){
+        sendOnebehospitalCode.sendOnebehospitalCode(structuralDataVo.getBehospitalCode(),structuralDataVo.getPatientId());
     }
     @ApiOperation(value = "{历史病例导入时间格式}")
     @PostMapping("/sendStructuralDateOld")