Merge remote-tracking branch 'origin/his/yiwufuyou_new' into his/yiwufuyou_new

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

@@ -198,6 +198,46 @@ public class BehospitalInfo implements Serializable {
      */
     private String modifier;
 
+    /**
+     * 取消入院，如果为0则表示未取消入院
+     */
+
+    private String isCancelBehospital;
+
+    public String getIsCancelBehospital() {
+        return isCancelBehospital;
+    }
+
+    public void setIsCancelBehospital(String isCancelBehospital) {
+        this.isCancelBehospital = isCancelBehospital;
+    }
+
+    public String getIsDaytime() {
+        return isDaytime;
+    }
+
+    public void setIsDaytime(String isDaytime) {
+        this.isDaytime = isDaytime;
+    }
+
+    public String getIsBaby() {
+        return isBaby;
+    }
+
+    public void setIsBaby(String isBaby) {
+        this.isBaby = isBaby;
+    }
+
+    public String getInState() {
+        return inState;
+    }
+
+    public void setInState(String inState) {
+        this.inState = inState;
+    }
+
+
+
     public String getBehospitalCode() {
         return behospitalCode;
     }

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

@@ -270,21 +270,30 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
     }
 
-    public RespDTO sendDateInfo(String startDate, String endDate){
+    public RespDTO sendDateInfo(String startDate, String endDate, String isLeave){
         try {
             //验证数据是否存在
             if(StringUtil.isBlank(startDate)){
                 return RespDTO.onError("请输入开始时间!");
             }else if(StringUtil.isBlank(endDate)){
                 return RespDTO.onError("请输入截止时间!");
+            }else if(StringUtil.isBlank(isLeave)){
+                return RespDTO.onError("请输入统计方式标识!");
             }else{
-                String sql = "SELECT * FROM AI_V_SENDPATIENTINFO t WHERE to_char(t.behospitalDate,'yyyy-mm-dd') >='" + startDate
-                        + "' and to_char(t.behospitalDate,'yyyy-mm-dd') < '" + endDate + "'";
+                String sql = "";
+                if("2".equals(isLeave)){
+                    sql = "SELECT * FROM AI_V_SENDPATIENTINFO t WHERE to_char(t.leaveHospitalDate,'yyyy-mm-dd') >='" + startDate
+                            + "' and to_char(t.leaveHospitalDate,'yyyy-mm-dd') < '" + endDate + "'";
+                }else {
+                    sql = "SELECT * FROM AI_V_SENDPATIENTINFO t WHERE to_char(t.behospitalDate,'yyyy-mm-dd') >='" + startDate
+                            + "' and to_char(t.behospitalDate,'yyyy-mm-dd') < '" + endDate + "'";
+                }
                 sql = sql.replace("\"","");
                 List<BehospitalInfo> behospitalInfoList = tzDBConn.getBehospitalInfo(sql);
                 if(behospitalInfoList.size() == 0){
                     return RespDTO.onError("未找到病历!");
                 }
+                aMedAbnormalInfoFacade.saveAbnormalInfo("准备执行插入语句","对应总数"+behospitalInfoList.size(), sql,"","");
                 execute(behospitalInfoList);
             }
             return RespDTO.onSuc("入院信息更新成功！");

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

@@ -394,10 +394,12 @@ public class TZDBConn {
 	 */
 	public List<BehospitalInfo> getBehospitalInfo(String sql) {
 		List<BehospitalInfo> behospitalInfoList=Lists.newLinkedList();
+		int i = 1;
 		try {
 			TZDBConn dbconn=new TZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
+				i++;
 				BehospitalInfo behospitalInfo=new BehospitalInfo();
 				behospitalInfo.setBehospitalCode(rs.getString("BEHOSPITALCODE"));//病人住院ID
 				behospitalInfo.setHospitalId(HOSPITAL_ID);//医院ID
@@ -429,8 +431,10 @@ public class TZDBConn {
 				behospitalInfo.setIsPlacefile(rs.getString("ISPLACEFILE"));
 				behospitalInfo.setIsDaytime(rs.getString("ISDAYTIME"));//日间病例标志
 				behospitalInfo.setPlacefileDate(DateUtil.parseDateTime(rs.getString("PLACEFILEDATE")));
+				behospitalInfo.setIsCancelBehospital(rs.getString("QUXIAORYBZ"));
 				behospitalInfoList.add(behospitalInfo);
 			}
+			aMedAbnormalInfoFacade.saveAbnormalInfo("获取病历信息-语句查询对应TZDBConn","查询出的总数"+i, sql,"","");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}finally {

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

@@ -239,11 +239,14 @@ public class DataController {
         return aHomePageFacade.updateHomePage(behospitalCode,startDate,endDate);
     }
 
-    @ApiOperation(value = "数据引擎-历史数据更新入院信息数据(义乌妇幼保健院)[by:dsYun]")
+    @ApiOperation(value = "数据引擎-历史数据更新入院信息数据(义乌妇幼保健院)[by:dsYun]",
+            notes = "startDate： 开始时间【yyyy-mm-dd】<br>" +
+                    "endDate： 结束时间【yyyy-mm-dd】 <br>" +
+                    "isLeave： 1：入院时间 2：出院时间<br>" )
     @PostMapping("/sendDateInfo")
     @SysLogger("sendDateInfo")
-    public RespDTO sendDateInfo(@RequestBody String startDate, String endDate){
-        return aBehospitalInfoFacade.sendDateInfo(startDate,endDate);
+    public RespDTO sendDateInfo(@RequestBody String startDate, String endDate, String isLeave){
+        return aBehospitalInfoFacade.sendDateInfo(startDate,endDate,isLeave);
     }
 
     @ApiOperation(value = "数据引擎-历史数据更新入院信息数据(义乌妇幼保健院)[by:dsYun]")

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -39,7 +39,8 @@
         <result column="gmt_modified" property="gmtModified"/>
         <result column="creator" property="creator"/>
         <result column="modifier" property="modifier"/>
-        <result column="linkman" property="linkman"/>
+        <result column="is_cancel_behospital" property="isCancelBehospital"/>
+        <result column="is_baby" property="isBaby"/>
     </resultMap>
 
     <select id="getPage" resultType="com.diagbot.dto.BehospitalInfoDTO">
@@ -6358,6 +6359,8 @@
                     director_doctor_name = #{item.directorDoctorName},
                     placefile_date = #{item.placefileDate},
                     is_placefile = #{item.isPlacefile},
+                    is_baby = #{item.isBaby},
+                    is_cancel_behospital = #{item.isCancelBehospital},
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>