检验检查

pom.xml

@@ -233,6 +233,43 @@
             <scope>system</scope>
             <systemPath>${java.home}/../lib/tools.jar</systemPath>
         </dependency>
+
+
+        <!-- axis 1.4 jar start -->
+        <dependency>
+            <groupId>org.apache.axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-discovery</groupId>
+            <artifactId>commons-discovery</artifactId>
+            <version>0.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis</groupId>
+            <artifactId>axis-jaxrpc</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis</groupId>
+            <artifactId>axis-saaj</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <!-- axis 1.4 jar end -->
+
+
     </dependencies>
 
 

src/main/java/com/diagbot/entity/QcType.java

@@ -2,6 +2,7 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.Date;
  * @author gaodm
  * @since 2020-05-27
  */
+@Data
 public class QcType implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -39,6 +41,8 @@ public class QcType implements Serializable {
      */
     private Long defaultModule;
 
+    private String sex;
+
     /**
      * 备注
      */

src/main/java/com/diagbot/enums/CacheKeyEnum.java

@@ -22,9 +22,9 @@ public enum CacheKeyEnum implements KeyedString {
     RESCUE_NOTE("抢救记录", "strRescueNote"),
     CRISIS_NOTE("危急值记录", "strCrisisNote"),
     LEAVE_HOSPITAL("出院小结", "strLeaveHospital"),
-    CONSULTATION_APPLY("会诊申请单", "strConsultationApply"),
-    CONSULTATION_RESULT("会诊结果单", "strConsultationResult"),
-    CONSULTATION_NOTE("会诊单", "strConsultationNote"),
+    CONSULTATION_APPLY("会诊申请单", "strConsultationResult"),
+//    CONSULTATION_RESULT("会诊结果单", "strConsultationResult"),
+//    CONSULTATION_NOTE("会诊单", "strConsultationNote"),
     CONSULTATION_RECORD("会诊记录","strConsultationRecord");
     /*
     FIRST_RECORD(2, "aStrFirstRecordFacade"),

src/main/java/com/diagbot/enums/ModeIdEnum.java

@@ -22,7 +22,7 @@ public enum ModeIdEnum implements KeyedNamed {
     OPERATIVE_AGREE_BOOK (16, "手术知情同意书"),
     OPERATIVE_FIRST_NOTE(18, "术后首次病程及谈话记录"),
 //            (20, "手术风险评估表"),
-    OPERATIVE_SAFE_SURFACE (21, "手术安全核查表"),
+//    OPERATIVE_SAFE_SURFACE (21, "手术安全核查表"),
     DIFFICULT_CASE(19, "疑难病例讨论记录"),
     OPERATIVE_NOTE(17, "手术记录"),
     RESCUE_NOTE(22, "抢救记录"),
@@ -33,8 +33,8 @@ public enum ModeIdEnum implements KeyedNamed {
     TRANSFER_OUT_NOTE(27, "转出记录"),
     PERIOD_CONCLUSION(28, "阶段小结"),
     ILL_SERIOUSL(29, "病重通知书"),
-    CONSULTATION_APPLY(30, "会诊申请单"),
-    CONSULTATION_RESULT(31, "会诊结果单"),
+    CONSULTATION_APPLY(31, "会诊申请单"),
+//    CONSULTATION_RESULT(31, "会诊结果单"),
     DATA_MODEL(32, "输血后效果评价"),
 //    DATA_MODEL(33, "专科交接单"),
 //    DATA_MODEL(34, "转科记录"),
@@ -49,7 +49,7 @@ public enum ModeIdEnum implements KeyedNamed {
     PACS_INTO(57, "检查信息"),
     LIS_INFO(58, "检验信息"),
     //LIS_INFO(59, "有创操作"),
-    CRISIS_INFO(59, "危急值记录"),
+    CRISIS_INFO(59, "危急值信息"),
     CONSULTATION_NOTE(60, "会诊单"),
     MED_BEHOSPITAL_INFO(63, "入院登记");
     @Setter

src/main/java/com/diagbot/enums/TableNameEnum.java

@@ -33,7 +33,7 @@ public enum TableNameEnum implements KeyedNamed {
     TRANSFER_OUT_NOTE(27, "str_transfer_out_note"),//转出记录
     PERIOD_CONCLUSION(28, "str_period_conclusion"),//阶段小结
     ILL_SERIOUSL(29, "str_ill_seriousl"),//病重通知书
-    CONSULTATION_APPLY(30, "str_consultation_apply"),//会诊申请单
+    CONSULTATION_APPLY(31, "str_consultation_apply"),//会诊申请单
 //    CONSULTATION_RESULT(31, "str_consultation_result"),//会诊结果单
     DATA_MODEL(32, "str_blood_result"),//输血后效果评价
 //    DATA_MODEL(33, "专科交接单"),

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

@@ -149,27 +149,26 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
      */
     private Long initQcTypeId(BehospitalInfo s){
         Long qcTypeId=Long.valueOf("0");
-        MedicalRecord medicalRecord = aMedicalRecordFacade.getOne(new QueryWrapper<MedicalRecord>()
-                .eq("behospital_code", s.getBehospitalCode())
-                .eq("hospital_id", s.getHospitalId())
-                .eq("mode_id", Long.valueOf("1"))
-                .eq("is_deleted",IsDeleteEnum.N), false);
-        if(medicalRecord!=null){
-            QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
-                    .eq("name", medicalRecord.getRecTitle())
-                    .eq("hospital_id", medicalRecord.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N));
-            if(qcType!=null && qcType.getDefaultModule()==0){
-                qcTypeId=qcType.getId();
-            }else{
-                QcType qcTypeStand=qcTypeFacade.getOne(new QueryWrapper<QcType>()
-                        .eq("default_module", 1)
-                        .eq("hospital_id", medicalRecord.getHospitalId())
-                        .eq("is_deleted",IsDeleteEnum.N));
-                if(qcTypeStand!=null){
-                    qcTypeId=qcTypeStand.getId();
-                }
-            }
+        List<QcType> qcTypeList =qcTypeFacade.list(new QueryWrapper<QcType>()
+            .eq("beh_dept_id",s.getBehDeptId())
+            .eq("hospital_id",s.getHospitalId())
+            .eq("is_deleted",IsDeleteEnum.N));
+        if (qcTypeList.size()==0){
+            QcType qcType = qcTypeFacade.getOne(new QueryWrapper<QcType>()
+                .eq("default_module",1)
+                .eq("hospital_id",s.getHospitalId())
+                .eq("sex",s.getSex())
+                .eq("is_deleted",IsDeleteEnum.N));
+                qcTypeId =qcType.getId();
+        }else if (qcTypeList.size()==1){
+            qcTypeId =qcTypeList.get(0).getId();
+        }else {
+            QcType qcType =new QcType();
+            qcTypeList.forEach(qc->{
+                if (qc.getSex().equals(s.getSex()))
+                    qcType.setId(qc.getId());
+            });
+            qcTypeId =qcType.getId();
         }
         return qcTypeId;
     }
@@ -199,6 +198,8 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
     }
 
+
+
     public RespDTO placeFileFlag(APlaceFileVO aPlaceFileVO){
         try {
             //验证数据是否存在

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

@@ -6,6 +6,7 @@ import com.diagbot.entity.*;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.enums.TableNameEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.facade.str.*;
 import com.diagbot.util.ReadProperties;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.StructuralDataVo;

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

@@ -1,6 +1,9 @@
 package com.diagbot.facade.data;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.OutputInfo;
 import com.diagbot.dto.RespDTO;
@@ -8,11 +11,11 @@ import com.diagbot.dto.Response;
 import com.diagbot.dto.data.AMedicalRecordDTO;
 import com.diagbot.entity.*;
 import com.diagbot.enums.CacheKeyEnum;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.enums.TableNameEnum;
-import com.diagbot.facade.BehospitalInfoFacade;
-import com.diagbot.facade.MedCrisisInfoFacade;
-import com.diagbot.facade.StrCrisisNoteFacade;
+import com.diagbot.facade.*;
+import com.diagbot.facade.str.*;
 import com.diagbot.util.*;
 import com.diagbot.vo.AnalyzeRunVO;
 import com.diagbot.vo.QueryVo;
@@ -100,6 +103,10 @@ public class StructuralDataFacade {
     private AStrInformedConsentFacade aStrInformedConsentFacade;
     @Autowired
     private AMedCrisisFacade aMedCrisisFacade;
+    @Autowired
+    private MedLisInfoFacade medLisInfoFacade;
+    @Autowired
+    private MedPacsInfoFacade medPacsInfoFacade;
 
     private FJTZDBConnHarp fjtzdbConnHarp = new FJTZDBConnHarp();
 
@@ -119,6 +126,12 @@ public class StructuralDataFacade {
             //装载数据
             execute(structuralDataVos);
 //
+            String[] modeList={"8","10","53","54","57","58","59","60","55","23"};
+            for (String modeId: modeList ) {
+                if (modeId.equals(structuralDataVos.getModeId())){
+                    return RespDTO.onSuc("该模块没有质控条目");
+                }
+            }
             //返回评分结构体
             return mrIng(structuralDataVos);
 
@@ -218,17 +231,7 @@ public class StructuralDataFacade {
             }else if("会诊申请单".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
                 if (hisViewVos.size()>0){
-                    aStrConsultationResultFacade.getOneList(hisViewVos,s.getModeId());
-                }
-            }else if("会诊结果单".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrConsultationResultFacade.getOneList(hisViewVos,s.getModeId());
-                }
-            }else if("会诊单".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
-                if (hisViewVos.size()>0){
-                    aStrConsultationNoteFacade.getOneList(hisViewVos,s.getModeId());
+                    aStrConsultationResultFacade.getOneList(hisViewVos,"31");
                 }
             }else if ("会诊记录".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sql(s));
@@ -249,7 +252,8 @@ public class StructuralDataFacade {
                 /**
                  * 病案首页
                  */
-                String sql ="select * from "+s.getTableName()+" where  behospitalCode='"+s.getBehospitalCode()+"' and homePageId='"+s.getRecId()+"'" ;
+                String sql ="select * from "+s.getTableName()+" where  behospitalCode='"+ s.getBehospitalCode()+
+                        "' and homePageId='"+s.getRecId()+"' and patientId='"+s.getPatientId()+ "'";
                 List<HisHomePageVO> homePage =fjtzdbConnHarp.getHomePage(sql);
                 if (homePage.size()>0) {
                     aHomePageFacade.getOneList(homePage);//病案首页
@@ -271,28 +275,50 @@ public class StructuralDataFacade {
                     aHomeOperationInfoFacade.execute(homeOperationInfos);//病案首页手术
                 }
             }else if ("医嘱信息".equals(modelName)){
-                String sql="select * from  med_doctor_advice  where "+" behospitalCode='"+s.getBehospitalCode()+"' and doctorAdviceId='"+s.getRecId()+"'" ;
+                String sql="select * from  med_doctor_advice  where "+" behospitalCode='"+s.getBehospitalCode()+
+                        "' and doctorAdviceId='"+s.getRecId()+"' and patientId='"+s.getPatientId()+ "'";
                 List<DoctorAdvice> doctorAdvice =fjtzdbConnHarp.getDoctorAdvice(sql);
                 if (doctorAdvice.size()>0){
                     aDoctorAdviceFacade.execute(doctorAdvice);
                 }
             }else if ("入院登记".equals(modelName)) {
-                String sql = "select * from " + s.getTableName() + "   where  behospitalCode='" + s.getBehospitalCode() + "'";
+                String sql = "select * from " + s.getTableName() + "   where  behospitalCode='" + s.getBehospitalCode() +"' and patientId='"+s.getPatientId()+ "'";
                 List<BehospitalInfo> behospitalInfo = fjtzdbConnHarp.getBehospitalInfo(sql);
                 if (behospitalInfo.size() > 0) {
                     aBehospitalInfoFacade.execute(behospitalInfo);
                 }
-            }else if ("检查信息".equals(modelName)){
-                List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(this.sql(s));
-                if (pacsResult.size()>0){
-                    aMedPacsResultFacade.execute(pacsResult);
+            }
+            else if ("检查信息".equals(modelName)){
+                String sql ="select * from med_pacs_info where behospitalCode ='"+s.getBehospitalCode()+
+                        "' and recId = '"+s.getRecId()+"' and patientId='"+s.getPatientId()+ "'";
+
+                List<MedPacsInfo> pacsInfo =fjtzdbConnHarp.getPacsInfo(sql);
+                if (pacsInfo.size()>0){
+                    pacsInfo.forEach(pacs->{
+                        medPacsInfoFacade.save(pacs);
+                    });
+                    List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(this.sql(s));
+                    if (pacsResult.size()>0){
+                        aMedPacsResultFacade.execute(pacsResult);
+                    }
                 }
             }else if ("检验信息".equals(modelName)){
-                List<MedLisResult> lisResult =fjtzdbConnHarp.getLisResult(this.sql(s));
-                if (lisResult.size()>0){
-                    aMedLisResultFacade.execute(lisResult);
+                String sql ="select * from med_lis_info where behospitalCode ='"+ s.getBehospitalCode()+
+                        "' and recId = '"+s.getRecId()+"' and patientId='"+s.getPatientId()+ "'";
+
+                List<MedLisInfo> lisInfo =fjtzdbConnHarp.getLisInfo(sql);
+                if (lisInfo.size()>0){
+                    lisInfo.forEach(lis->{
+                        medLisInfoFacade.save(lis);
+                    });
+                    List<MedLisResult> lisResult =fjtzdbConnHarp.getLisResult(this.sql(s));
+                    if (lisResult.size()>0){
+                        aMedLisResultFacade.execute(lisResult);
+                    }
                 }
-            }else if ("谈话告知书".equals(modelName)){
+
+            }
+            else if ("谈话告知书".equals(modelName)){
                 List<StrTalkInform> strTalkInforms =fjtzdbConnHarp.getStrTalkInform(this.sql(s));
                 if (strTalkInforms.size()>0){
                     aStrTalkInformFacade.execute(strTalkInforms);
@@ -338,6 +364,15 @@ public class StructuralDataFacade {
         String behospitalCode = structuralDataVos.getBehospitalCode();
         Long hospitalId = structuralDataVos.getHospitalId();
         Long modeId = Long.valueOf(structuralDataVos.getModeId());
+        QueryWrapper queryWrapper =Wrappers.query();
+        BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
+                .eq("behospital_code", behospitalCode)
+                .eq("hospital_id", hospitalId)
+                .eq("is_deleted",IsDeleteEnum.N), false);
+        if (null == behospitalInfo){
+            structuralDataVos.setModeId("63");
+            execute(structuralDataVos);
+        }
         if (structuralDataVos.getDockModeType().equals("1")) {
             //页面模式
             String url = readProperties.getProcessQcUrl() + "?behospitalCode=" + behospitalCode + "&hospitalId=" + hospitalId + "&modeId=" + modeId;
@@ -366,7 +401,10 @@ public class StructuralDataFacade {
      * @return
      */
     public String sql(StructuralDataVo s){
-        String sql ="select * from  "+s.getTableName()+"  t where  t.behospitalCode='"+s.getBehospitalCode()+"' and t.recId= '"+s.getRecId()+"'" ;
+        String sql ="select * from  "+s.getTableName()+
+                "  where behospitalCode='"+s.getBehospitalCode()+
+                "' and recId= '"+s.getRecId()+
+                "' and patientId='"+s.getPatientId()+ "'";
 
         return sql;
     }

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

@@ -5,6 +5,9 @@ import com.diagbot.entity.*;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.enums.TableNameEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.facade.MedLisInfoFacade;
+import com.diagbot.facade.MedPacsInfoFacade;
+import com.diagbot.facade.str.*;
 import com.diagbot.util.FJTZDBConnHarp;
 import com.diagbot.util.ReadProperties;
 import com.diagbot.vo.data.FJStrAdmissionNoteVo;
@@ -95,6 +98,10 @@ public class StructuralOldDataFacade {
     private AStrInformedConsentFacade aStrInformedConsentFacade;
     @Autowired
     private AMedCrisisFacade aMedCrisisFacade;
+    @Autowired
+    private MedLisInfoFacade medLisInfoFacade;
+    @Autowired
+    private MedPacsInfoFacade medPacsInfoFacade;
 
     private FJTZDBConnHarp fjtzdbConnHarp = new FJTZDBConnHarp();
 
@@ -279,14 +286,6 @@ public class StructuralOldDataFacade {
                     }
                 }
             }else if("会诊申请单".equals(modelName)){
-                List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
-                if (hisViewVos.size()>0){
-                    Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
-                    for (String key:map.keySet()) {
-                        aStrConsultationApplyFacade.getOneList(map.get(key),s.getModeId());
-                    }
-                }
-            }else if("会诊结果单".equals(modelName)){
                 List<HisViewVo> hisViewVos =fjtzdbConnHarp.getHisView(this.sqlOld(s));
                 if (hisViewVos.size()>0){
                     Map<String,List<HisViewVo>> map=this.executeOldDeci(hisViewVos);
@@ -330,7 +329,7 @@ public class StructuralOldDataFacade {
                 /**
                  * 病案首页
                  */
-                String sql ="select * from "+s.getTableName()+" t where  t.behospitalCode='"+s.getBehospitalCode()+"'" ;
+                String sql ="select * from "+s.getTableName()+"  where  behospitalCode='"+s.getBehospitalCode()+"' and patientId='"+s.getPatientId()+ "'";
                 List<HisHomePageVO> homePage =fjtzdbConnHarp.getHomePage(sql);
                 if (homePage.size()>0) {
                     aHomePageFacade.getOneList(homePage);//病案首页
@@ -361,22 +360,44 @@ public class StructuralOldDataFacade {
                 if (behospitalInfo.size() > 0) {
                     aBehospitalInfoFacade.execute(behospitalInfo);
                 }
-            }else if ("检查信息".equals(modelName)){
-                List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(this.sqlOld(s));
-                if (pacsResult.size()>0){
-                    aMedPacsResultFacade.execute(pacsResult);
+            }
+            else if ("检查信息".equals(modelName)){
+                String sql ="select * from med_pacs_info where behospitalCode ='"+s.getBehospitalCode()+"' and patientId='"+s.getPatientId()+ "'";
+                List<MedPacsInfo> pacsInfo =fjtzdbConnHarp.getPacsInfo(sql);
+                if (pacsInfo.size()>0){
+                    pacsInfo.forEach(pacs->{
+                        medPacsInfoFacade.save(pacs);
+                        String pacsSql ="select * from med_pacs_result where behospitalCode ='"+s.getBehospitalCode()+
+                                "' and recId = '"+pacs.getRepNo()+"'";
+                        List<MedPacsResult> pacsResult =fjtzdbConnHarp.getPacsResult(pacsSql);
+                        if (pacsResult.size()>0){
+                            aMedPacsResultFacade.execute(pacsResult);
+                        }
+                    });
+
                 }
             }else if ("检验信息".equals(modelName)){
-                List<MedLisResult> lisResult =fjtzdbConnHarp.getLisResult(this.sqlOld(s));
-                if (lisResult.size()>0){
-                    aMedLisResultFacade.execute(lisResult);
+                String sql ="select * from med_lis_info where behospitalCode ='"+s.getBehospitalCode()+"' and patientId='"+s.getPatientId()+ "'";
+                List<MedLisInfo> lisInfo =fjtzdbConnHarp.getLisInfo(sql);
+                if (lisInfo.size()>0){
+                    lisInfo.forEach(lis->{
+                        medLisInfoFacade.save(lis);
+                        String lisSql ="select * from med_lis_result where behospitalCode ='"+s.getBehospitalCode()+
+                                "' and recId = '"+lis.getRepNo()+"' and patientId='"+s.getPatientId()+ "'";
+                        List<MedLisResult> lisResult =fjtzdbConnHarp.getLisResult(lisSql);
+                        if (lisResult.size()>0){
+                            aMedLisResultFacade.execute(lisResult);
+                        }
+                    });
+
                 }
-            } else if ("知情同意书".equals(modelName)){
+            }
+            else if ("谈话告知书".equals(modelName)){
                 List<StrTalkInform> strTalkInforms =fjtzdbConnHarp.getStrTalkInform(this.sqlOld(s));
                 if (strTalkInforms.size()>0){
                     aStrTalkInformFacade.execute(strTalkInforms);
                 }
-            }else if ("谈话告知书".equals(modelName)){
+            }else if ("知情同意书".equals(modelName)){
                 List<StrInformedConsent> strInformedConsents =fjtzdbConnHarp.getStrInformedConsent(this.sqlOld(s));
                 if (strInformedConsents.size()>0){
                     aStrInformedConsentFacade.execute(strInformedConsents);
@@ -431,7 +452,7 @@ public class StructuralOldDataFacade {
      * @return
      */
     public String sqlOld(StructuralDataVo s){
-        String sql ="select * from "+s.getTableName()+" t where t.behospitalCode = '"+s.getBehospitalCode()+"'";
+        String sql ="select * from "+s.getTableName()+"  where behospitalCode = '"+s.getBehospitalCode()+"' and patientId='"+s.getPatientId()+ "'";
         return sql;
     }
 }

src/main/java/com/diagbot/facade/str/AStrAdmissionNoteFacade.java

@@ -8,6 +8,8 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;

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

@@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.MedicalRecordContent;
-import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.entity.StrBloodResult;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
-import com.diagbot.entity.StrFirstRecord;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
@@ -25,7 +24,6 @@ import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrBloodResultVO;
 import com.diagbot.vo.str.StrBloodResultVO;
 import com.google.common.collect.Lists;
-import com.diagbot.vo.data.FJStrAdmissionNoteVo;
 import com.diagbot.vo.data.HisViewVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrAdmissionNote;
-import com.diagbot.entity.StrBloodResult;
 import com.diagbot.entity.StrBloodTransfusion;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrBloodTransfusionServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -22,7 +22,6 @@ import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrBloodTransfusionVO;
-import com.diagbot.vo.data.FJStrAdmissionNoteVo;
 import com.diagbot.vo.data.HisViewVo;
 import com.diagbot.vo.str.StrBloodTransfusionVO;
 import com.google.common.collect.Lists;

src/main/java/com/diagbot/facade/str/AStrConsultationApplyFacade.java

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.entity.StrConsultationApply;
-import com.diagbot.entity.StrRescueNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrConsultationApplyServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -22,7 +22,6 @@ import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrConsultationApplyVO;
-import com.diagbot.vo.data.FJStrAdmissionNoteVo;
 import com.diagbot.vo.data.HisViewVo;
 import com.diagbot.vo.str.StrConsultationApplyVO;
 import com.google.common.collect.Lists;

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

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.entity.StrConsultationNote;
-import com.diagbot.entity.StrRescueNote;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrConsultationNoteServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -22,7 +22,6 @@ import com.diagbot.util.MapUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AStrConsultationNoteVO;
-import com.diagbot.vo.data.FJStrAdmissionNoteVo;
 import com.diagbot.vo.data.HisViewVo;
 import com.diagbot.vo.str.StrConsultationNoteVO;
 import com.google.common.collect.Lists;

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

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrConsultationRecordServiceImpl;
 import com.diagbot.util.BeanUtil;

src/main/java/com/diagbot/facade/str/AStrConsultationResultFacade.java

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrConsultationResultServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -63,7 +65,7 @@ public class AStrConsultationResultFacade extends StrConsultationResultServiceIm
         try {
             Map<String,Object> map =new HashMap<>();
             Map<String,Object> wholeData =new HashMap<>();
-            String modelName = ModeIdEnum.getName(Integer.parseInt("31"));
+            String modelName = ModeIdEnum.getName(Integer.parseInt(modeId));
             Map<String,String> tableKey=columnFacade.getColumn(CacheKeyEnum.getName(modelName));
             //循环list根据咱字段的名称来跟得到的数据来做比较
             for (HisViewVo s: hisViewVos) {
@@ -79,8 +81,12 @@ public class AStrConsultationResultFacade extends StrConsultationResultServiceIm
                 }
             }
             StrConsultationResult strConsultationResult =new StrConsultationResult();
-            strConsultationResult = (StrConsultationResult) MapUtil.mapToObject(map, StrConsultationResult.class);
+            AStrConsultationResultVO strConsultationResult1 = (AStrConsultationResultVO) MapUtil.mapToObject(map, AStrConsultationResultVO.class);
+
+
+            BeanUtils.copyProperties(strConsultationResult1,strConsultationResult);
             BeanUtils.copyProperties(hisViewVos.get(0),strConsultationResult);
+
             strConsultationResult.setWholeData(JSON.toJSONString(wholeData));
 
             aMedicalRecordContentFacade.executeByView(hisViewVos.get(0));

src/main/java/com/diagbot/facade/str/AStrCrisisNoteFacade.java

@@ -13,6 +13,8 @@ import com.diagbot.entity.StrFirstRecord;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrCrisisNoteServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -44,6 +46,11 @@ public class AStrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
     private ColumnFacade columnFacade;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+    @Autowired
+    private AMedicalRecordContentFacade aMedicalRecordContentFacade;
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
+
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -73,6 +80,8 @@ public class AStrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
             strCrisisNote.setRecordDate(DateUtil.parseDateTime(strCrisisNoteVO.getRecordDate()));//病历日期
 
             strCrisisNote.setWholeData(columnMap);
+
+
             //判断数据库中是否存在，不存在insert
             if(isExist(strCrisisNote)){
                 strCrisisNote.setGmtCreate(new Date());//记录创建时间
@@ -147,6 +156,10 @@ public class AStrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
                     });
                 });
             }
+            HisViewVo hisViewVo =new HisViewVo();
+            BeanUtils.copyProperties(medCrisisNote,hisViewVo);
+            aMedicalRecordContentFacade.executeByView(hisViewVo);
+            aMedicalRecordFacade.executeByView(hisViewVo,"23");
 
             //判断数据库中是否存在，不存在insert
             if(isExist(medCrisisNote)){

src/main/java/com/diagbot/facade/str/AStrDeathDiscussionFacade.java

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrDeathDiscussionServiceImpl;
 import com.diagbot.util.BeanUtil;

src/main/java/com/diagbot/facade/str/AStrDeathNoteFacade.java

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrDeathNoteServiceImpl;
 import com.diagbot.util.BeanUtil;

src/main/java/com/diagbot/facade/str/AStrDifficultCaseFacade.java

@@ -12,6 +12,8 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.entity.StrDifficultCase;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrDifficultCaseServiceImpl;
 import com.diagbot.util.BeanUtil;

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

@@ -13,6 +13,8 @@ import com.diagbot.entity.StrFirstRecord;
 import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrFirstRecordServiceImpl;
 import com.diagbot.entity.MedicalRecord;

src/main/java/com/diagbot/facade/str/AStrIllCriticallyFacade.java

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrIllCriticallyServiceImpl;
 import com.diagbot.util.BeanUtil;

src/main/java/com/diagbot/facade/str/AStrIllSeriouslFacade.java

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrIllSeriouslServiceImpl;
 import com.diagbot.util.BeanUtil;

src/main/java/com/diagbot/facade/str/AStrLeaveHospitalFacade.java

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrLeaveHospitalServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -75,18 +77,24 @@ public class AStrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
             AStrLeaveHospitalVO strLeaveHospitalVO =new AStrLeaveHospitalVO();
             StrLeaveHospital strLeaveHospital = new StrLeaveHospital();
             strLeaveHospitalVO = (AStrLeaveHospitalVO) MapUtil.mapToObject(map, AStrLeaveHospitalVO.class);
-            BeanUtils.copyProperties(hisViewVos.get(0),strLeaveHospitalVO);
+            BeanUtils.copyProperties(strLeaveHospitalVO,strLeaveHospital);
+
+            BeanUtils.copyProperties(hisViewVos.get(0),strLeaveHospital);
 
-            //时间赋值
 
+            //时间赋值
             strLeaveHospital.setAuditDate(DateUtil.parseDateTime(strLeaveHospitalVO.getAuditDate()));//审核时间
             strLeaveHospital.setRecDate(DateUtil.parseDateTime(strLeaveHospitalVO.getRecDate()));//记录时间
-            strLeaveHospital.setBehospitalDate(DateUtil.parseDateTime(strLeaveHospitalVO.getBehospitalDate()));//入院日期
-            strLeaveHospital.setLeaveHospitalDate(DateUtil.parseDateTime(strLeaveHospitalVO.getLeaveHospitalDate()));//出院时间
+            strLeaveHospital.setBehospitalDate(DateUtil.parseDate(strLeaveHospitalVO.getBehospitalDate(),"yyyy/MM/dd HH:mm:ss"));//入院日期
+            strLeaveHospital.setLeaveHospitalDate(DateUtil.parseDate(strLeaveHospitalVO.getLeaveHospitalDate(),"yyyy-MM-dd HH:mm"));//出院时间
+
             strLeaveHospital.setRecordDate(DateUtil.parseDateTime(strLeaveHospitalVO.getRecordDate()));//病历日期
 
-            BeanUtils.copyProperties(strLeaveHospitalVO,strLeaveHospital);
-            strLeaveHospital.setHospitalId(hisViewVos.get(0).getHospitalId());
+            if (null ==strLeaveHospital.getLeaveHospitalDate()){
+                strLeaveHospital.setLeaveHospitalDate(DateUtil.parseDate(strLeaveHospitalVO.getLeaveHospitalDate()));//出院时间
+            }
+
+
 
 
             if (strLeaveHospital.getLeaveHospitalDate()!=null && strLeaveHospital.getBehospitalDate()!=null){

src/main/java/com/diagbot/facade/str/AStrOperativeFirstRecord.java

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrOperativeFirstRecordServiceImpl;
 import com.diagbot.util.BeanUtil;

src/main/java/com/diagbot/facade/str/AStrOperativeNoteFacade.java

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrOperativeNoteServiceImpl;
 import com.diagbot.util.BeanUtil;

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

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrPeriodConclusionServiceImpl;
 import com.diagbot.util.BeanUtil;

src/main/java/com/diagbot/facade/str/AStrPreoperativeDiscussionFacade.java

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrPreoperativeDiscussionServiceImpl;
 import com.diagbot.util.BeanUtil;

src/main/java/com/diagbot/facade/str/AStrRescueNoteFacade.java

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrRescueNoteServiceImpl;
 import com.diagbot.util.BeanUtil;

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

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrTransferInNoteServiceImpl;
 import com.diagbot.util.BeanUtil;

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

@@ -13,6 +13,8 @@ import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrTransferOutNoteServiceImpl;
 import com.diagbot.util.BeanUtil;

src/main/java/com/diagbot/facade/str/AStrWardRecordFacade.java

@@ -14,6 +14,8 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.entity.StrWardRecord;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
 import com.diagbot.facade.data.ColumnFacade;
 import com.diagbot.service.impl.StrWardRecordServiceImpl;
 import com.diagbot.util.*;

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

@@ -449,7 +449,6 @@ public class FJTZDBConnHarp {
 				medLisResult.setUnit(rs.getString("unit"));//单位
 				medLisResult.setAbnormal(rs.getString("abnormal"));//异常标志
 //				medLisResult.setColor(rs.getString("color"));//异常颜色
-
 				medLisResultList.add(medLisResult);
 			}
 		} catch (Exception e) {
@@ -498,6 +497,67 @@ public class FJTZDBConnHarp {
 	}
 
 
+	/**
+	 * 从视图中获取检查
+	 * @return
+	 */
+	public List<MedLisInfo> getLisInfo(String sql){
+		List<MedLisInfo> medLisInfos=Lists.newLinkedList();
+		try {
+			FJTZDBConnHarp dbconn=new FJTZDBConnHarp();
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				MedLisInfo medLisInfo=new MedLisInfo();
+				medLisInfo.setRepNo(rs.getString("recId"));
+				medLisInfo.setHospitalId(String.valueOf(rs.getLong("hospitalId")));
+				medLisInfo.setBehospitalCode(rs.getString("behospitalCode"));
+				medLisInfo.setRepName(rs.getString("repName"));
+				medLisInfo.setRepType(rs.getString("repType"));
+				medLisInfo.setRepTypeName(rs.getString("repTypeName"));
+				medLisInfo.setSlideType(rs.getString("slideType"));
+				medLisInfo.setRepDate(rs.getString("repDate"));
+				medLisInfo.setCheckDate(rs.getString("checkDate"));
+				medLisInfo.setApplyDoctor(rs.getString("applyDoctor"));
+
+				medLisInfos.add(medLisInfo);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally {
+			close();
+		}
+		return medLisInfos;
+	}
+
+
+	public List<MedPacsInfo> getPacsInfo(String sql){
+		List<MedPacsInfo> medPacsInfos=Lists.newLinkedList();
+		try {
+			FJTZDBConnHarp dbconn=new FJTZDBConnHarp();
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				MedPacsInfo medPacsInfo=new MedPacsInfo();
+				medPacsInfo.setRepNo(rs.getString("recId"));
+				medPacsInfo.setHospitalId(String.valueOf(rs.getLong("hospitalId")));
+				medPacsInfo.setBehospitalCode(rs.getString("behospitalCode"));
+				medPacsInfo.setRepName(rs.getString("repName"));
+				medPacsInfo.setRepType(rs.getString("repType"));
+				medPacsInfo.setRepTypeName(rs.getString("repTypeName"));
+				medPacsInfo.setPart(rs.getString("part"));
+				medPacsInfo.setRepDate(rs.getString("repDate"));
+				medPacsInfo.setCheckDate(rs.getString("checkDate"));
+				medPacsInfo.setApplyDoctor(rs.getString("applyDoctor"));
+
+				medPacsInfos.add(medPacsInfo);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally {
+			close();
+		}
+		return medPacsInfos;
+	}
+
 
 	/**
 	 * 从视图中获取入院记录

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

@@ -11,6 +11,12 @@ public class StructuralDataVo {
      * 病历号
      */
     private  String behospitalCode;
+
+    /**
+     * 档案号
+     */
+    private  String patientId;
+
     /**
      * 文书id
      */