Browse Source

日间病历,小儿外科(住)以儿科日间质控

liuqq 3 years ago
parent
commit
0376ea938c

+ 7 - 6
pom.xml

@@ -183,12 +183,13 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
-       
-       <dependency>
-	      <groupId>com.oracle</groupId>
-	      <artifactId>ojdbc6</artifactId>
-	      <version>11.2.0.3</version>
-	    </dependency>
+
+        <!--oracle-database-->
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>11.2.0.3</version>
+        </dependency>
     
     	<dependency>
 			<groupId>com.microsoft.sqlserver</groupId>

+ 0 - 54
src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

@@ -167,53 +167,6 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
     }
 
-    /**
-     * 初始化QcTypeId
-     * @param s
-     * @return
-     */
-//    private Long initQcTypeId(BehospitalInfo s){
-//        Long qcTypeId=Long.valueOf("0");
-//        try {
-//            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", s.getHospitalId())
-//                        .eq("is_deleted",IsDeleteEnum.N), false);
-//                if(qcType!=null){
-//                    qcTypeId=qcType.getId();
-//                }else{
-//                    //新增类型到qc_type表中
-//                    QcType qctype=new QcType();
-//                    qctype.setHospitalId(s.getHospitalId());
-//                    qctype.setName(medicalRecord.getRecTitle());
-//                    qctype.setGmtCreate(new Date());
-//
-//                    Long id=qcTypeFacade.saveT(qctype);
-//                    qcTypeId=id;
-//
-//                    //新增类型到监测表中
-//                    QcAbnormal qcAbnormal=new QcAbnormal();
-//                    qcAbnormal.setHospitalId(s.getHospitalId());
-//                    qcAbnormal.setBehospitalCode(s.getBehospitalCode());
-//                    qcAbnormal.setType(2);
-//                    qcAbnormal.setDescription(medicalRecord.getRecTitle());
-//                    qcAbnormal.setGmtCreate(new Date());
-//                    qcAbnormalFacade.getBaseMapper().insert(qcAbnormal);
-//                }
-//            }
-//            //aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-qctypeid初始化",JSON.toJSONString(s),qcTypeId.toString(),"操作正常!");
-//            return qcTypeId;
-//        }catch (Exception e){
-//            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-qctypeid初始化异常",JSON.toJSONString(s),"",e.getMessage());
-//            return qcTypeId;
-//        }
-//    }
     private Long initQcTypeId(BehospitalInfo s) {
         Long qcTypeId = Long.valueOf("0");
         List<MedicalRecord> medicalRecord = aMedicalRecordFacade.list(new QueryWrapper<MedicalRecord>()
@@ -227,16 +180,10 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("hospital_id", s.getHospitalId())
                 .eq("is_deleted", IsDeleteEnum.N));
         if (medicalRecord.size() > 0) {
-//            MedRecordType medRecordType =aMedRecordTypeFacade.getOne(new QueryWrapper<MedRecordType>()
-//                    .eq("hospital_id",medicalRecord.get(0).getHospitalId())
-//                    .eq("type_id",medicalRecord.get(0).getRecTypeId())
-//                    .eq("is_deleted", IsDeleteEnum.N));
-//            if (medRecordType != null){
                 if(qcTypeList == null || 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) {
@@ -250,7 +197,6 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     });
                     qcTypeId = qcType.getId();
                 }
-//            }
         }
         return qcTypeId;
     }

+ 0 - 73
src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -61,17 +61,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
-    @Autowired
-    private AMedRecordTypeFacade aMedRecordTypeFacade;
-
     private TZDBConn tzDBConn = new TZDBConn();
 
-    @Autowired
-    private SqlProperties sqlProperties;
-
-    @Autowired
-    private BasDeptInfoFacade basDeptInfoFacade;
-
     @Autowired
     private AHomePageFacade aHomePageFacade;
 
@@ -490,52 +481,10 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         String idsJson = JSONObject.toJSONString(ret.get("IDs"));
         aHomePageVO.setHospitalCode(idsJson);
         List<Object> operationList = paramsObj.getJSONArray("手术信息");
-//        if(operationList.size() > 0){
-//            List<AHomeOperationVO> operationInfo = Lists.newLinkedList();
-//            for (int i = 0; i < operationList.size(); i++) {
-//                AHomeOperationVO aHomeOperationVO = new AHomeOperationVO();
-//                aHomeOperationVO.setHomePageId(behospitalCode);
-//                aHomeOperationVO.setHospitalId(hospitalId);
-//                aHomeOperationVO.setOperationOrderNo(String.valueOf(i));
-//                aHomeOperationVO.setOperationDate(((JSONArray) operationList).getJSONObject(i).getString("手术日期"));//待定2020-08-11
-//                aHomeOperationVO.setOperationCode(((JSONArray) operationList).getJSONObject(i).getString("手术编码"));
-//                aHomeOperationVO.setOperationDoctorId(((JSONArray) operationList).getJSONObject(i).getString("手术医生ID"));
-//                aHomeOperationVO.setFirstAssistantId(((JSONArray) operationList).getJSONObject(i).getString("一助医生ID"));
-//                aHomeOperationVO.setSecondAssistantId(((JSONArray) operationList).getJSONObject(i).getString("二助医生ID"));
-//                aHomeOperationVO.setCutLevel(((JSONArray) operationList).getJSONObject(i).getString("切口等级"));
-//                aHomeOperationVO.setHealingLevel(((JSONArray) operationList).getJSONObject(i).getString("愈合等级"));
-//                aHomeOperationVO.setOperationName(((JSONArray) operationList).getJSONObject(i).getString("手术名称"));
-//                aHomeOperationVO.setOperationLevel(((JSONArray) operationList).getJSONObject(i).getString("手术级别"));
-//                aHomeOperationVO.setAnaesthesiaName(((JSONArray) operationList).getJSONObject(i).getString("麻醉方式"));
-//                //aHomeOperationVO.setShamOperationName();
-//
-//                operationInfo.add(aHomeOperationVO);
-//            }
-//            aHomePageVO.setOperations(operationInfo);
-//        }
         String ssqkSql = "SELECT * FROM AI_V_SENDHOMEPAGEING_SSQK t where t.homepageid = '" + behospitalCode + "'";
         String cyzdSql = "SELECT * FROM AI_V_SENDHOMEPAGEING_CYZD t where t.homepageid = '" + behospitalCode + "'";
         aHomePageVO.setOperations(tzDBConn.getHomePageOperation(ssqkSql));
         aHomePageVO.setLeaveDiags(tzDBConn.getHomePageDiagnose(cyzdSql));
-//        List<Object> diagnoseList = paramsObj.getJSONArray("出院诊断");
-//        if (diagnoseList.size() > 0) {
-//            List<AHomeDiagnoseVO> leaveDiags = Lists.newLinkedList();
-//            for (int i = 0; i < operationList.size(); i++) {
-//                AHomeDiagnoseVO aHomeDiagnoseVO = new AHomeDiagnoseVO();
-//                aHomeDiagnoseVO.setHomePageId(behospitalCode);
-//                aHomeDiagnoseVO.setHospitalId(hospitalId);
-//                aHomeDiagnoseVO.setDiagnoseOrderNo(String.valueOf(i));//非空字段
-//                aHomeDiagnoseVO.setDiagnoseType(i == 0 ? "主要诊断" : "其他诊断");
-//                //aHomeDiagnoseVO.setDiagnoseTypeShort();
-//                aHomeDiagnoseVO.setDiagnoseName(((JSONArray) diagnoseList).getJSONObject(i).getString("诊断名称"));
-//                aHomeDiagnoseVO.setBehospitalType(((JSONArray) diagnoseList).getJSONObject(i).getString("入院情况"));
-//                aHomeDiagnoseVO.setLeaveHospitalType(((JSONArray) diagnoseList).getJSONObject(i).getString("出院情况"));
-//                //aHomeDiagnoseVO.setPathologyDiagnose();
-//                aHomeDiagnoseVO.setIcdCode(((JSONArray) diagnoseList).getJSONObject(i).getString("诊断编码"));
-//                leaveDiags.add(aHomeDiagnoseVO);
-//            }
-//            aHomePageVO.setLeaveDiags(leaveDiags);
-//        }
         aHomePageVOList.add(aHomePageVO);
         return aHomePageVOList;
     }
@@ -620,33 +569,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             if (behDeptId.equals("52425")) {
                 /**妇科(住)日间病历、24小时出入院记录的病历模板,映射妇科日间*/
                 behDeptId = "52883";
-                BasDeptInfo basDeptInfo = basDeptInfoFacade.getOne(new QueryWrapper<BasDeptInfo>()
-                        .eq("dept_id", behDeptId)
-                        .eq("hospital_id", behospitalInfo.getHospitalId())
-                        .eq("is_deleted", IsDeleteEnum.N));
-                behospitalInfo.setBehDeptId(behDeptId);
-                behospitalInfo.setBehDeptName(basDeptInfo.getDeptName());
-                behospitalInfo.setGmtModified(DateUtil.now());
             } else if (behDeptId.equals("51944")) {
                 /**乳腺外科日间病历、24小时出入院记录的病历模板,映射乳腺外科日间日间*/
                 behDeptId = "52923";
-                BasDeptInfo basDeptInfo = basDeptInfoFacade.getOne(new QueryWrapper<BasDeptInfo>()
-                        .eq("dept_id", behDeptId)
-                        .eq("hospital_id", behospitalInfo.getHospitalId())
-                        .eq("is_deleted", IsDeleteEnum.N));
-                behospitalInfo.setBehDeptId(behDeptId);
-                behospitalInfo.setBehDeptName(basDeptInfo.getDeptName());
-                behospitalInfo.setGmtModified(DateUtil.now());
             } else if (behDeptId.equals("52424") || behDeptId.equals("52643")) {
                 /**儿科日间病历、24小时出入院记录的病历模板、小儿外科住,映射儿科日间*/
                 behDeptId = "52903";
-                BasDeptInfo basDeptInfo = basDeptInfoFacade.getOne(new QueryWrapper<BasDeptInfo>()
-                        .eq("dept_id", behDeptId)
-                        .eq("hospital_id", behospitalInfo.getHospitalId())
-                        .eq("is_deleted", IsDeleteEnum.N));
-                behospitalInfo.setBehDeptId(behDeptId);
-                behospitalInfo.setBehDeptName(basDeptInfo.getDeptName());
-                behospitalInfo.setGmtModified(DateUtil.now());
             }
         }
         List<QcType> qcTypeList = qcTypeFacade.list(new QueryWrapper<QcType>()
@@ -671,7 +599,6 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 });
                 qcTypeId = qcType.getId();
             }
-//            }
         }
         return qcTypeId;
     }