院区id补入接口

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

@@ -66,6 +66,12 @@ public class BasDeptInfo implements Serializable {
      */
     private Date gmtModified;
 
+    /**
+    * 院区id
+    */
+    private Long hospitalCampusId;
+
+
     /**
      * 创建人，0表示无创建人值
      */
@@ -160,22 +166,30 @@ public class BasDeptInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+    public Long getHospitalCampusId() {
+        return hospitalCampusId;
+    }
+
+    public void setHospitalCampusId(Long hospitalCampusId) {
+        this.hospitalCampusId = hospitalCampusId;
+    }
 
     @Override
     public String toString() {
         return "BasDeptInfo{" +
-            "deptId=" + deptId +
-            ", hospitalId=" + hospitalId +
-            ", parentDeptId=" + parentDeptId +
-            ", deptName=" + deptName +
-            ", deptType=" + deptType +
-            ", spell=" + spell +
-            ", station=" + station +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
+                "deptId='" + deptId + '\'' +
+                ", hospitalId=" + hospitalId +
+                ", parentDeptId='" + parentDeptId + '\'' +
+                ", deptName='" + deptName + '\'' +
+                ", deptType='" + deptType + '\'' +
+                ", spell='" + spell + '\'' +
+                ", station='" + station + '\'' +
+                ", isDeleted='" + isDeleted + '\'' +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", hospitalCampusId=" + hospitalCampusId +
+                ", creator='" + creator + '\'' +
+                ", modifier='" + modifier + '\'' +
+                '}';
     }
 }

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

@@ -39,6 +39,47 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
         List<BasDeptInfo> basDeptInfoList = tzDBConn.getDeptInfo(sql);
         execute(basDeptInfoList);
     }
+    /**
+     * 同步前一天科室的信息,把院区id同步
+     */
+    public void executeDeptCampusId() {
+        String sql="select * from AI_V_SENDDEPTINFOS";
+        List<BasDeptInfo> basDeptInfoList = tzDBConn.getDeptInfo(sql);
+        execute(basDeptInfoList);
+    }
+//    /**
+//     * 同步科室院区id
+//     */
+//    public void executeDeptHospitalCampusId() {
+//        String sql="select * from AI_V_SENDDEPTINFOS";
+//        List<BasDeptInfo> basDeptInfoList = tzDBConn.getDeptInfo(sql);
+////        List<BasDeptInfo> addE=Lists.newArrayList();
+////        List<BasDeptInfo> updateE=Lists.newArrayList();
+//        basDeptInfoList.stream().forEach(s -> {
+//            BasDeptInfo basDeptInfo =this.getOne(new QueryWrapper<BasDeptInfo>()
+//                    .eq("dept_id", s.getDeptId())
+//                    .eq("hospital_id", s.getHospitalId()), false);
+//            if (basDeptInfo != null){
+//                Long hospitalCampusid=s.getHospitalCampusId();
+//                BasDeptInfoMapper basDeptInfoMapper = new BasDeptInfoMapper();
+//                basDeptInfoMapper.updateCampusId(basDeptInfo);
+//            }
+//        }
+//            if (basDeptInfo != null) {
+//                s.setHospitalCampusId(s.getHospitalCampusId());
+//                updateE.add(s);
+//            } else {
+//                s.setGmtCreate(new Date());
+//                addE.add(s);
+//            }
+//        });
+//        if(updateE.size()>0){
+//            basDeptInfoService.updateBatchByKey(updateE);
+//        }
+//        if(addE.size()>0){
+//            basDeptInfoService.saveBatch(addE);
+//        }
+//    }
 
     /**
      * 同步历史数据

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

@@ -140,6 +140,33 @@ public class TZDBConn {
 
 		return basDoctorInfoList;
 	}
+//	/**
+//	 * 从视图中获取医院科室数据，把院区id新增到科室表中
+//	 */
+//	public List<BasDeptInfo> getDeptHospitalCampusIdInfo(String sql){
+//		List<BasDeptInfo> basDeptInfoList=Lists.newLinkedList();
+//		try {
+//			TZDBConn dbconn=new TZDBConn();
+//			ResultSet rs =dbconn.Query(sql, null);
+//			while(rs.next()){
+//				BasDeptInfo basDeptInfo=new BasDeptInfo();
+//				basDeptInfo.setDeptId(rs.getString("ZZKSDM"));//科室编码
+//				basDeptInfo.setHospitalId(HOSPITAL_ID);//医院ID
+//				basDeptInfo.setDeptName(rs.getString("ZZKSMC"));//科室名称
+//				//basDeptInfoVO.setDeptType(rs.getString("ZZKSLB"));//科室类别
+//				basDeptInfo.setSpell(rs.getString("HZSRM1"));//首字母拼音
+//				//basDeptInfoVO.setStation(rs.getString("FLKSID"));//区域类别
+//
+//				basDeptInfoList.add(basDeptInfo);
+//			}
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}finally {
+//			close();
+//		}
+//		return basDeptInfoList;
+//	}
+
 
 	/**
 	 * 从视图中获取医院科室数据，根据修改时间同步数据
@@ -152,12 +179,18 @@ public class TZDBConn {
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
 				BasDeptInfo basDeptInfo=new BasDeptInfo();
-				basDeptInfo.setDeptId(rs.getString("ZZKSDM"));//科室编码
+				//basDeptInfo.setDeptId(rs.getString("ZZKSDM"));//科室编码
 				basDeptInfo.setHospitalId(HOSPITAL_ID);//医院ID
-				basDeptInfo.setDeptName(rs.getString("ZZKSMC"));//科室名称
+				basDeptInfo.setDeptName(rs.getString("HOSPITALID"));//科室名称
 				//basDeptInfoVO.setDeptType(rs.getString("ZZKSLB"));//科室类别
-				basDeptInfo.setSpell(rs.getString("HZSRM1"));//首字母拼音
+				//basDeptInfo.setSpell(rs.getString("HZSRM1"));//首字母拼音
 				//basDeptInfoVO.setStation(rs.getString("FLKSID"));//区域类别
+				basDeptInfo.setHospitalCampusId(rs.getLong("YUANQUID"));//院区ID
+				basDeptInfo.setDeptId(rs.getString("DEPTID"));//科室ID
+				basDeptInfo.setParentDeptId(rs.getString("PARENTDEPTID"));//上级科室ID
+				basDeptInfo.setDeptType(rs.getString("DEPTTYPE"));//科室类别
+				basDeptInfo.setSpell(rs.getString("SPELL"));
+				basDeptInfo.setStation(rs.getString("STATION"));
 
 				basDeptInfoList.add(basDeptInfo);
 			}

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -77,6 +76,12 @@ public class DataController {
     public RespDTO<List<ABasDeptInfoDTO>> sendDeptInfos(@RequestBody List<ABasDeptInfoVO> list){
         return aBasDeptInfoFacade.executeDept(list);
     }
+    @ApiOperation(value = "数据引擎-更新医院所有有效科室的基本信息（病区id）")
+    @PostMapping("/updateDeptInfos")
+    @SysLogger("updateDeptInfos")
+    public void updateDeptInfos(){
+        aBasDeptInfoFacade.executeDeptCampusId();
+    }
 
     @ApiOperation(value = "数据引擎-获取医院所有文书模板基本信息")
     @PostMapping("/sendRecordTypes")