diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 7b5edb33..48145131 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -26,12 +26,10 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; +import java.util.*; /** * @author zwh @@ -424,6 +422,15 @@ public class FontController { Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); title="超期的病案通知"; OverdueRemindVO overdueRemindVO= new OverdueRemindVO(); + DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + String date2="2021-01-01"; + Date date1=null; + try { + date1=format.parse(date2); + } catch (ParseException e) { + e.printStackTrace(); + } + overdueRemindVO.setDate1(date1); //查询主治医生id String s = user.getUserName(); System.out.println("s:::" + s); diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index bc817c09..305e4f04 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -9,6 +9,7 @@ package com.emr.controller; import com.emr.entity.*; import com.emr.service.*; import com.emr.util.IDHelper; +import com.emr.util.OracleConnect; import com.emr.util.ThreadExcelUtils; import org.apache.commons.lang3.StringUtils; import org.apache.cxf.endpoint.Client; diff --git a/src/main/java/com/emr/controller/commitController.java b/src/main/java/com/emr/controller/commitController.java index e3b29ae6..d0a5e3d0 100644 --- a/src/main/java/com/emr/controller/commitController.java +++ b/src/main/java/com/emr/controller/commitController.java @@ -112,10 +112,9 @@ public class commitController { String nowTime = format1.format(new Date()); emrFaultDetail.setUpdater(username); emrFaultDetail.setUpdateTime(nowTime); - //修改复审内容 - //1、查询出该病案的创建时间最近的缺陷记录 - //Emr_Fault_Detail entity= emrFaultDetailService.selectByArchiveDetailId(emrFaultDetail); - //emrFaultDetail.setId(entity.getId()); + emrFaultDetail.setArchiveDetailId(emrFaultDetail.getArchiveDetailId()); + Emr_Fault_Detail entity= emrFaultDetailService.selectByArchiveDetailId(emrFaultDetail); + emrFaultDetail.setId(entity.getId()); //2、修改缺陷记录 bol = emrFaultDetailService.updateCloByPrimaryKey(emrFaultDetail); } diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index a19a4d22..e18d94b7 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -31,6 +31,10 @@ public class Archive_Master_Vo { private String dischargeDateTime; + + + private Date dischargeDateTime1; + public Date getDischargeDateTime1() { return dischargeDateTime1; } @@ -39,8 +43,6 @@ public class Archive_Master_Vo { this.dischargeDateTime1 = dischargeDateTime1; } - private Date dischargeDateTime1; - private String archivestate; private String admissionDateTime; @@ -222,10 +224,18 @@ public class Archive_Master_Vo { this.jqFlag = jqFlag; } + public Integer getOverTime2() { + return overTime2; + } + + public void setOverTime2(Integer overTime2) { + this.overTime2 = overTime2; + } + private Integer overTime; private Integer jqFlag; - + private Integer overTime2; public String getOverTime1() { return overTime1; diff --git a/src/main/java/com/emr/entity/Emr_Fault_Detail.java b/src/main/java/com/emr/entity/Emr_Fault_Detail.java index 08400f3e..949b2913 100644 --- a/src/main/java/com/emr/entity/Emr_Fault_Detail.java +++ b/src/main/java/com/emr/entity/Emr_Fault_Detail.java @@ -9,6 +9,16 @@ public class Emr_Fault_Detail { private String assortId; + private String visitId; + + public String getVisitId() { + return visitId; + } + + public void setVisitId(String visitId) { + this.visitId = visitId; + } + private Integer parentId; private String content; diff --git a/src/main/java/com/emr/entity/Sign_List_Vo.java b/src/main/java/com/emr/entity/Sign_List_Vo.java index 422dee61..0c1458d4 100644 --- a/src/main/java/com/emr/entity/Sign_List_Vo.java +++ b/src/main/java/com/emr/entity/Sign_List_Vo.java @@ -58,11 +58,22 @@ public class Sign_List_Vo { private BigDecimal n2; private BigDecimal n3; + + public String getOperateName() { + return operateName; + } + + public void setOperateName(String operateName) { + this.operateName = operateName; + } + /** * 纸质病历送达时间（可等同于签收时间） */ private String t1; + private String operateName; + private String t2; private String T3; diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index 45c2534e..bf518e9c 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -506,8 +506,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { Date date1=null; Date date2=null; Date date3=null; - Date date4=null; - Date date5=null; List list = archiveMasterMapper.selectOverdue(archiveMasterVo); @@ -552,43 +550,38 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //遍历匹配工号赋值姓名 String overTime1 = archiveMaster.getOverTime1(); String handleTime = archiveMaster.getHandleTime(); + String dischargeDateTime = archiveMaster.getDischargeDateTime(); try { date1=format.parse(overTime1); date2=format.parse(handleTime); + date3=format.parse(dischargeDateTime); } catch (ParseException e) { e.printStackTrace(); } + System.out.println("date3::::"+date3); Calendar ca1 = Calendar.getInstance(); Calendar ca2 = Calendar.getInstance(); ca1.setTime(date1); ca2.setTime(date2); long distanceMin =( ca2.getTimeInMillis()- ca1.getTimeInMillis())/(1000*60*60*24); int i= (int)distanceMin; - if (i>0){ - archiveMaster.setOverTime(i); - }else{ - archiveMaster.setOverTime(0); + archiveMasterVo.setDischargeDateTime1(date3); + Integer integer = archiveMasterMapper.selectTime1(archiveMasterVo); + System.out.println("integer:::::"+integer); + if (integer==1){ + if (i>0){ + archiveMaster.setOverTime(i); + }else { + archiveMaster.setOverTime(0); + } + }else + if (integer==2){ + if (i>0){ + archiveMaster.setOverTime(i); + }else { + archiveMaster.setOverTime(0); + } } - -// String inpNo = archiveMaster.getInpNo(); -// int iinpNo = Integer.parseInt(inpNo); -// System.out.println("iinpNo:::::"+iinpNo); -// if (iinpNo==1598263){ -// archiveMaster.setOverTime(1); -// }else -// if (i>0 && integer1==2){ -// int i1 = i - 2; -// if (i1>0){ -// archiveMaster.setOverTime(i1); -// }else { -// archiveMaster.setOverTime(0); -// } -// }else if (i>0 && integer1==1) { -// archiveMaster.setOverTime(i); -// }else{ -// archiveMaster.setOverTime(0); -// } - for (Power_User_Dto powerUserDto : powerUserList) { String name = powerUserDto.getName(); if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) { diff --git a/src/main/java/com/emr/util/OracleConnect.java b/src/main/java/com/emr/util/OracleConnect.java index 4f47f28a..4f7edf1b 100644 --- a/src/main/java/com/emr/util/OracleConnect.java +++ b/src/main/java/com/emr/util/OracleConnect.java @@ -1,4 +1,3 @@ -/* package com.emr.util; import com.alibaba.druid.pool.DruidDataSource; @@ -9,15 +8,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -*/ /** * Oracle链接数据库对象 * * @author ZL * * 2017年7月27日 - *//* - + */ public class OracleConnect { private static DruidDataSource dataSourceTest = null; private static PreparedStatement pst = null; @@ -26,11 +23,9 @@ public class OracleConnect { private String url = PropertiesUtils.getProperty("oracleUrl"); private String userName = PropertiesUtils.getProperty("oracleUserName"); private String passWord = PropertiesUtils.getProperty("oraclePassWord"); - */ -/** + /** * 构造函数完成数据库的连接和连接对象的生成 - *//* - + */ private OracleConnect() { try { if (dataSourceTest == null) { @@ -48,13 +43,11 @@ public class OracleConnect { } } - */ -/** + /** * 取得已经构造生成的数据库连接 * * @return 返回数据库连接对象 - *//* - + */ public Connection getConnect() { try { return dataSourceTest.getConnection(); @@ -64,15 +57,13 @@ public class OracleConnect { return null; } - */ -/** + /** * 使用完一定要关闭（释放资源） * @param rs ResultSet * @param stat Statement * @param conn Connection * @throws Exception - *//* - + */ private static void CloseConn(ResultSet rs, Statement stat, Connection conn){ if (rs != null) { try { @@ -97,15 +88,13 @@ public class OracleConnect { } } - */ -/** + /** * 查询一条(多条)记录 * * @param arg0 查询的sql语句 * @return list * @throws Exception - *//* - + */ @SuppressWarnings({ "rawtypes", "unchecked" }) public static String select(String arg0) throws Exception { String str = ""; @@ -198,4 +187,3 @@ public class OracleConnect { return 1; } } -*/ diff --git a/src/main/java/com/emr/util/PropertiesUtils.java b/src/main/java/com/emr/util/PropertiesUtils.java new file mode 100644 index 00000000..9888a4b9 --- /dev/null +++ b/src/main/java/com/emr/util/PropertiesUtils.java @@ -0,0 +1,29 @@ +package com.emr.util; + + +import java.io.IOException; +import java.util.Properties; + +public class PropertiesUtils { + private static String fileName = "\\config\\config.properties"; + private static Properties props; + + synchronized static private void loadProps(){ + if (props==null) { + props = new Properties(); + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + try { + props.load(loader.getResourceAsStream(fileName)); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + public static String getProperty(String key){ + if(null == props) { + loadProps(); + } + return props.getProperty(key); + } +} diff --git a/src/main/java/com/emr/vo/OverdueRemindVO.java b/src/main/java/com/emr/vo/OverdueRemindVO.java index 25ee50f4..45e6decd 100644 --- a/src/main/java/com/emr/vo/OverdueRemindVO.java +++ b/src/main/java/com/emr/vo/OverdueRemindVO.java @@ -29,4 +29,6 @@ public class OverdueRemindVO { /**提醒时间*/ private Date reminderTime; private String DOCTOR_IN_CHARGE; + + private Date date1; } diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 652e92de..ad7fa36f 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -10,6 +10,3 @@ sqlServerClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver sqlServerUrl=jdbc:sqlserver://10.3.6.94:1433;DatabaseName=headpage_gyfs_1 sqlServerUserName=sa sqlServerPassword=xjgs+docus911 - - - diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 6d1dec50..340f8966 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -108,6 +108,7 @@ + @@ -1466,9 +1467,9 @@ 0) diffDay, (SELECT max(b.date) FROM (select top 4 date from emr_holiday_set where date >= CONVERT ( - VARCHAR (100), + VARCHAR (10), m.discharge_date_time, - 23 + 120 ) and flag= 1 order by date asc) as b) as overTime1 -- ( -- SELECT MAX(b.date) diff --git a/src/main/resources/mapper/Sign_ListMapper.xml b/src/main/resources/mapper/Sign_ListMapper.xml index 14580831..3e5aa13b 100644 --- a/src/main/resources/mapper/Sign_ListMapper.xml +++ b/src/main/resources/mapper/Sign_ListMapper.xml @@ -56,6 +56,7 @@ + @@ -65,11 +66,11 @@ select COUNT(*)as overdueNum from Archive_Master a - left JOIN Archive_Master_Following f on f.master_id=a.ID where a.DOCTOR_IN_CHARGE=#{doctorInCharge} and a.DOCTOR_IN_CHARGE is not null and a.DOCTOR_IN_CHARGE!='' + and a.discharge_date_time>'2021-01-01 ' + and a.ArchiveState='归档中' and 3 <= ( - CASE - WHEN ( - ( - SELECT - count(1) - FROM - emr_holiday_set - WHERE - flag = 1 - AND date >= CONVERT ( - VARCHAR (100), - a.discharge_date_time, - 23 - ) - AND date <= CONVERT ( - VARCHAR (100), - f.handle_time, - 23 - ) - ) - 3 - ) <= 0 THEN 0 else - ( - ( SELECT count(1) FROM @@ -49,12 +27,11 @@ ) AND date <= CONVERT( VARCHAR (100), - f.handle_time, + getDate(), 23 ) - ) - 3 - ) - end) + ) - 4 +