diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 5436c2f8..b7d9d375 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -202,7 +202,6 @@ public class beHospitaledController { if (flagNum == 0) { try { String endpoint = HomepageDictionary; - //String endpoint = "http://localhost:8080/ca3/services/caSynrochnized?wsdl"; String method = HomepageMethod; JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance(); Client client = factory.createClient(endpoint); @@ -210,8 +209,6 @@ public class beHospitaledController { Object[] res = null; res = client.invoke(method, temp); result = (String) res[0]; - //给方法传递参数，并且调用方法 - //System.out.println("result is " + result); } catch (Exception e) { System.err.println(e.toString()); return "连接不到完整性接口!"; @@ -222,6 +219,7 @@ public class beHospitaledController { archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); archiveMaster.setArchivestate(emrFaultDetail.getState()); archiveMaster.setLockinfo(result); + archiveMaster.setDirectorFlag(1); archiveMaster.setCmtDoctor(1); archiveMaster.setCmtNurse(1); int bol = archiveMasterService.updateByClo(archiveMaster); diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index e87f7cdd..1eb79c09 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -163,6 +163,8 @@ public interface Archive_MasterMapper { * @return */ List selectOverdue(Archive_Master_Vo record); + //获取初次审核信息 + ListgetFollowingInfo(@Param("ids")String ids); /** * 查询住院返修病历-超期天数列表 diff --git a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java index 8f096ec8..f50801fa 100644 --- a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java +++ b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java @@ -135,6 +135,9 @@ public interface Emr_Fault_DetailMapper { */ List masterTotalList(Emr_Fault_Vo emrFaultVo); + //获取费用信息 + List totalBackFee(@Param("ids") String ids,@Param("backFee")String backFee); + /** * 根据条件查询病案信息、退回总次数、总费用和总评分 diff --git a/src/main/java/com/emr/entity/Archive_Master.java b/src/main/java/com/emr/entity/Archive_Master.java index ebfc89e6..d3067cad 100644 --- a/src/main/java/com/emr/entity/Archive_Master.java +++ b/src/main/java/com/emr/entity/Archive_Master.java @@ -20,6 +20,16 @@ public class Archive_Master { private String dischargeDateTime; private String archivestate; + //科主任审核状态0否1.已 + private int directorFlag; + + public int getDirectorFlag() { + return directorFlag; + } + + public void setDirectorFlag(int directorFlag) { + this.directorFlag = directorFlag; + } private String admissionDateTime; 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 a04c8e35..b7950b32 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -947,6 +947,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } List list = archiveMasterMapper.selectOverdue(archiveMasterVo); if(list!=null && list.size()>0) { + //赋值签收信息 + //masterIds集合 + List masterIds = ListUtils.distinctSelect(list, Archive_Master_Vo::getMasterId); + //转成逗号拼接 + String ids = String.join(",", masterIds); + //根据分页的masterId获取签收信息 + List followingInfo = archiveMasterMapper.getFollowingInfo(ids); + //医生是否有缺陷 + Map followingMap = ListUtils.toMap(followingInfo, Archive_Master_Vo::getMasterId); + Setters.instance().list(list).cycleSetProperties(p -> { + String masterId = p.getMasterId(); + if (followingMap.containsKey(masterId)){ + String handleTime = followingMap.get(masterId).getHandleTime(); + String handleName = followingMap.get(masterId).getHandleName(); + p.setHandleTime(handleTime); + p.setHandleName(handleName); + } + }); //查询用户集合 JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = null; @@ -956,12 +974,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } //遍历赋值 for (Archive_Master_Vo archiveMaster : list) { - if (null != powerUserList) { - //获取主管医生 - String doctorInCharge = archiveMaster.getDoctorInCharge(); - //获取 初审人 - String firstInstance = archiveMaster.getFirstInstance(); - //遍历匹配工号赋值姓名 + if (StringUtils.isNotBlank(archiveMaster.getHandleTime())){ + //赋值超期天数 String overTime1 = archiveMaster.getOverTime1(); String handleTime = archiveMaster.getHandleTime(); String dischargeDateTime = archiveMaster.getDischargeDateTime(); @@ -972,19 +986,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } catch (ParseException e) { e.printStackTrace(); } - 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; + Calendar ca1 = Calendar.getInstance(); + Calendar ca2 = Calendar.getInstance(); + Calendar ca3 = Calendar.getInstance(); + ca1.setTime(date1); + ca2.setTime(date2); + ca3.setTime(date3); + long distanceMin =( ca2.getTimeInMillis()- ca1.getTimeInMillis())/(1000*60*60*24); + long distanceMin2 =( ca2.getTimeInMillis()- ca3.getTimeInMillis())/(1000*60*60*24); + int i= (int)distanceMin; + int i2= (int)distanceMin2; + archiveMaster.setDiffDay(String.valueOf(i2)); archiveMasterVo.setDischargeDateTime1(date3); if (i>0){ archiveMaster.setOverTime(i); }else { archiveMaster.setOverTime(0); } + } + if (null != powerUserList) { + //获取主管医生 + String doctorInCharge = archiveMaster.getDoctorInCharge(); + //获取 初审人 + String firstInstance = archiveMaster.getFirstInstance(); + //遍历匹配工号赋值姓名 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/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java index 470d7d57..4582ab74 100644 --- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java @@ -15,6 +15,8 @@ import com.emr.service.Emr_DictionaryService; import com.emr.service.Emr_Fault_DetailService; import com.emr.service.Emr_Fault_TypeService; import com.emr.service.PowerUserService; +import com.emr.util.ListUtils; +import com.emr.util.Setters; import com.emr.vo.Power_User_Dto; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -339,7 +341,39 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { } emrFaultVo.setBackFee(backFee); List list= emrFaultDetailMapper.masterTotalList(emrFaultVo); + if(list!=null && list.size()>0) { +// //masterIds集合 +// List masterIds = ListUtils.distinctSelect(list, Emr_Fault_Vo::getArchiveDetailId); +// //转成逗号拼接 +// String ids = String.join(",", masterIds); +// List emrFaultVos = emrFaultDetailMapper.totalBackFee(ids, backFee); +// //缺陷费用记录 +// Map emrFaultMap = ListUtils.toMap(emrFaultVos, Emr_Fault_Vo::getMasterId); +// //根据masterid插入缺陷费用信息 +// Setters.instance().list(list).cycleSetProperties(p -> { +// String masterId = p.getMasterId(); +// if (emrFaultMap.containsKey(masterId)){ +// String totalBackNum = emrFaultMap.get(masterId).getTotalBackNum(); +// String totalBackFee = emrFaultMap.get(masterId).getTotalBackFee(); +// p.setTotalBackNum(totalBackNum); +// p.setTotalBackFee(totalBackFee); +// } +// }); + //获取科室列表 + Emr_Dictionary dic = new Emr_Dictionary(); + dic.setEffective(1); + dic.setTypecode("dept_code"); + List dicList = emrDictionaryService.dicByTypeCode(dic); + //转换科室 + Map codeMap = ListUtils.toMap(dicList, Emr_Dictionary::getCode); + Setters.instance().list(list).cycleSetProperties(p -> { + String deptCode = p.getDeptName(); + if(StringUtils.isNotBlank(deptCode) && codeMap.containsKey(deptCode)){ + String deptName = codeMap.get(deptCode).getName(); + p.setDeptName(deptName); + } + }); JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); if (powerUserList != null){ @@ -365,7 +399,6 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { emr_fault_vo.setCreater(userInfo.getString("name")); } } - } } return list; diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 01207209..ace8683f 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,8 +1,8 @@ POWER_IP=127.0.0.1 jdbc.username=sa -jdbc.password=docus702 +jdbc.password=admin123 dataBaseName=zj_record_new -POWER_PORT=8081 +POWER_PORT=8082 jdbc.url=jdbc\:sqlserver\://${POWER_IP}:1433;databaseName=${dataBaseName} jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver @@ -25,7 +25,7 @@ pictureUrl=Z:\\test\\uploadImage #\u672C\u5730\u81EA\u52A8\u751F\u6210PDF\u5730\u5740D:\tesst\autoPdf autoPdfUrl=D:/test/autoPdf #\u672C\u5730\u4E0A\u4F20PDF\u5730\u5740 -pdfUrl=Z:\\test\\loadPdf +pdfUrl=D:\\test\\loadPdf #PDF\u6587\u4EF6\u4E0D\u5B58\u5728\u6216\u635F\u574F\u5217\u8868\u5730\u5740 pdfErrorUrl=Z:\\test\\error\\ diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index c40732b2..b41299f2 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -163,7 +163,7 @@ select - f.id,f.handle_name,f.handle_id,f.handle_time,ISNULL(DATEDIFF(dd,CONVERT(VARCHAR(20),m.discharge_date_time,23),CONVERT(VARCHAR(20),f.handle_time,23)), - 0) diffDay, (SELECT max(b.date) FROM (select top ${overdueDaysTwo} date from emr_holiday_set where date >= CONVERT ( VARCHAR (10), @@ -1525,19 +1526,12 @@ ,m.master_id,m.patient_id,m.inp_no,m.visit_id,m.name,m.dept_name,m.discharge_date_time,m.DOCTOR_IN_CHARGE, m.first_instance,m.death_flag,m.dept_admission_to,admission_date_time from ( - select id,master_id ,convert(varchar,handle_time,120) handle_time ,handle_id,handle_name,following_type from ( - select ROW_NUMBER() over(partition by master_id order by handle_time asc) RowNum - ,Archive_Master_Following.* - from Archive_Master_Following where 1=1 and following_type='5') as t1 where 1=1 and RowNum = 1 - ) f - LEFT JOIN ( - select id master_id,patient_id,inp_no,visit_id,name,dept_name,convert(varchar,discharge_date_time,120) - discharge_date_time,check_doctor,first_instance,DOCTOR_IN_CHARGE,death_flag,dept_admission_to,convert(varchar,admission_date_time,120) - admission_date_time + select id master_id,patient_id,inp_no,visit_id,name,dept_name, + discharge_date_time,check_doctor,first_instance,DOCTOR_IN_CHARGE,death_flag,dept_admission_to, + admission_date_time,director_flag from archive_master where 1=1 and ArchiveState not in('作废','已封存','取消入院') and Is_Valid!=1 ) m - on f.master_id=m.master_id - 1=1 and m.master_id!='' and m.master_id is not null + 1=1 and m.master_id!='' and m.master_id is not null and m.director_flag=1 and m.id = #{id,jdbcType=NVARCHAR} @@ -1576,19 +1570,8 @@ and CONVERT(VARCHAR(20),m.discharge_date_time,23) <= #{endDate,jdbcType=NCHAR} - - - and CONVERT(VARCHAR(20),f.handle_time,23) between #{createTimeStart,jdbcType=NCHAR} and #{createTimeEnd,jdbcType=NCHAR} - - - and CONVERT(VARCHAR(20),f.handle_time,23) >= #{createTimeStart,jdbcType=NCHAR} - - - and CONVERT(VARCHAR(20),f.handle_time,23) <= #{createTimeEnd,jdbcType=NCHAR} - - - ORDER BY m.master_id,m.discharge_date_time,f.handle_time asc + ORDER BY m.master_id,m.discharge_date_time asc + \ No newline at end of file diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml index 3cb7fc81..e843d96c 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -549,12 +549,12 @@ m.visit_id, m.name, m.dept_name, - CONVERT ( VARCHAR ( 20 ), m.discharge_date_time, 120 ) discharge_date_time, + m.discharge_date_time, m.ArchiveState, m.sex, m.ID_NO, m.dept_admission_to, - CONVERT ( VARCHAR ( 20 ), m.admission_date_time, 120 ) admission_date_time, + m.admission_date_time, m.DISCHARGE_DISPOSITION FROM archive_master m @@ -1163,78 +1163,167 @@ order by m.create_time desc - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index 06b69507..d785f937 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -119,12 +119,12 @@ <%––%> --%> -
- - -
+<%--
--%> +<%-- --%> +<%-- --%> +<%--
--%>
- - - -
-