diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 9999f506..15a4869a 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -284,7 +284,7 @@ public class FontController { tree.setId(id); tree.setParentId(0); tree.setName("全部影像资料"); - tree.setChecked("true"); +// tree.setChecked("true"); treeList.add(tree); oneParentId = id; id++; @@ -313,7 +313,10 @@ public class FontController { tree2.setParentId(twoParentId); tree2.setName(detailTemp.getTitle()); tree2.setSelfId(detailTemp.getId()); - tree2.setChecked("true"); + if (tree2.getName().contains("病案首页")){ + tree2.setChecked("true"); + } +// tree2.setChecked("true"); treeList.add(tree2); id++; flag = true; @@ -329,7 +332,10 @@ public class FontController { tree2.setParentId(twoParentId); tree2.setName(nurseDetailVoTemp.getTitle()); tree2.setSelfId(nurseDetailVoTemp.getId()); - tree2.setChecked("true"); +// tree2.setChecked("true"); + if (tree2.getName().contains("病案首页")){ + tree2.setChecked("true"); + } treeList.add(tree2); id++; nurseflag = true; @@ -343,14 +349,19 @@ public class FontController { tree2.setParentId(twoParentId); tree2.setName(detail.getTitle()); tree2.setSelfId(detail.getId()); - tree2.setChecked("true"); +// tree2.setChecked("true"); + if (tree2.getName().contains("病案首页")){ + tree2.setChecked("true"); + } treeList.add(tree2); id++; } } } tree1.setName(assortName + "("+count+")"); - tree1.setChecked("true"); + if (tree1.getName().contains("病案首页")){ + tree1.setChecked("true"); + } treeList.add(tree1); } TBasicBrowseHistory tBasicBrowseHistory = new TBasicBrowseHistory(); diff --git a/src/main/java/com/emr/controller/ScientificResearchController.java b/src/main/java/com/emr/controller/ScientificResearchController.java index f061d0d7..fe2ca79a 100644 --- a/src/main/java/com/emr/controller/ScientificResearchController.java +++ b/src/main/java/com/emr/controller/ScientificResearchController.java @@ -34,4 +34,23 @@ public class ScientificResearchController { public String scientificRecord(Model model) { return "scientificResearch/scientificRecord"; } + + + + @RequestMapping(value = "/medicalRecordStatistics") + public String medicalRecordStatistics(Model model) { + return "scientificResearch/medicalRecordStatistics"; + } + + @RequestMapping(value = "/recoveryStatistics") + public String recoveryStatistics(Model model) { return "scientificResearch/recoveryStatistics"; } + @RequestMapping(value = "/fileStatistics") + public String fileStatistics(Model model){ + return "scientificResearch/fileStatistics"; + } + @RequestMapping(value = "/borrowingStatistics") + public String borrowingStatistics(Model model) { return "scientificResearch/borrowingStatistics"; } + + @RequestMapping(value = "/windowPrintStatistics") + public String windowPrintStatistics(Model model) { return "scientificResearch/windowPrintStatistics"; } } diff --git a/src/main/java/com/emr/controller/StatisticsController.java b/src/main/java/com/emr/controller/StatisticsController.java new file mode 100644 index 00000000..27f6ed1f --- /dev/null +++ b/src/main/java/com/emr/controller/StatisticsController.java @@ -0,0 +1,73 @@ +package com.emr.controller; + +import com.emr.entity.*; +import com.emr.service.StatisticsService; +import net.sf.ehcache.Statistics; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@Controller +@RequestMapping("/Statistics") +public class StatisticsController { + + @Autowired + StatisticsService statisticsService; + + @ResponseBody + @RequestMapping(value = "/getStatistics") + public OffsetLimitPage getStatistics(HttpServletRequest request, HttpServletResponse response, StatisticsVo statisticsVo, Integer offset, Integer limit) { + response.setCharacterEncoding("utf-8"); + OffsetLimitPage result = statisticsService.getStatisticsVo(statisticsVo, offset, limit); + return result; + } + + + + @ResponseBody + @RequestMapping(value = "/getRecoveryStatistics") + public OffsetLimitPage getRecoveryStatistics(HttpServletRequest request, HttpServletResponse response, Archive_otherVo archiveOtherVo, Integer offset, Integer limit) { + response.setCharacterEncoding("utf-8"); + OffsetLimitPage result = statisticsService.getRecoveryStatistics(archiveOtherVo, offset, limit); + return result; + } + + + @ResponseBody + @RequestMapping(value = "/getFileStatistics") + public OffsetLimitPage getFileStatistics(HttpServletRequest request, HttpServletResponse response, FileVo fileVo, Integer offset, Integer limit) { + response.setCharacterEncoding("utf-8"); + OffsetLimitPage result = statisticsService.getFileStatistics(fileVo, offset, limit); + return result; + } + + + + @ResponseBody + @RequestMapping(value = "/getBorrowingStatistics") + public OffsetLimitPage getBorrowingStatistics(HttpServletRequest request, HttpServletResponse response, BorrowingVo borrowingVo, Integer offset, Integer limit) { + response.setCharacterEncoding("utf-8"); + OffsetLimitPage result = statisticsService.getBorrowingStatistics(borrowingVo, offset, limit); + return result; + } + + + + @ResponseBody + @RequestMapping(value = "/getWindowPrintStatistics") + public OffsetLimitPage getWindowPrintStatistics(HttpServletRequest request, HttpServletResponse response, WindowPrintVo windowPrintVo, Integer offset, Integer limit) { + response.setCharacterEncoding("utf-8"); + OffsetLimitPage result = statisticsService.getWindowPrintStatistics(windowPrintVo, offset, limit); + return result; + } + + + + + +} diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index 33d37f97..2d9ba86f 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -127,13 +127,13 @@ public class lastVerifyController { Emr_Fault_Detail entityFault=new Emr_Fault_Detail(); entityFault.setArchiveDetailId(emrFaultDetail.getArchiveDetailId()); List list=emrFaultDetailService.selectByArchiveId(entityFault); - //退回给emr - if(!"LG".equals(lgFlag)) { - String result = archiveMasterService.returnEmr(list,emrFaultDetail, archiveMaster, request); - if (StringUtils.isNotBlank(result)) { - return result; - } - } +// //退回给emr +// if(!"LG".equals(lgFlag)) { +// String result = archiveMasterService.returnEmr(list,emrFaultDetail, archiveMaster, request); +// if (StringUtils.isNotBlank(result)) { +// return result; +// } +// } archiveMaster.setArchivestate(emrFaultDetail.getState()); int doctorFlagNum=0; int nurseFlagNum=0; @@ -213,11 +213,19 @@ public class lastVerifyController { archive_master_following.setHandleName(handleName); archive_master_followingService.insertSelective(archive_master_following); archiveMasterService.updateByClo2(archiveMaster); + //退回给emr + if(!"LG".equals(lgFlag)) { + String result = archiveMasterService.returnEmr(list,emrFaultDetail, archiveMaster, request); + if (StringUtils.isNotBlank(result)) { + return result; + } + } } if("LG".equals(lgFlag)) { //留观号审核推送第三方 archiveMasterService.requestObservationRecord(inpatientNo, "RETURNED",null,list); } + }else{ bol=2; } diff --git a/src/main/java/com/emr/dao/StatisticsMapper.java b/src/main/java/com/emr/dao/StatisticsMapper.java new file mode 100644 index 00000000..29ea6cbd --- /dev/null +++ b/src/main/java/com/emr/dao/StatisticsMapper.java @@ -0,0 +1,26 @@ +package com.emr.dao; + +import com.emr.entity.*; + +import java.util.List; + +public interface StatisticsMapper { + + List getStatisticsVo(StatisticsVo statisticsVo); + + int getpaperlessPageNum(); + + + List getRecoveryStatistics(Archive_otherVo archiveOtherVo); + + + List getFileStatistics(FileVo fileVo); + + FileVo gethandleName(String masterId); + + List getBorrowingStatistics(BorrowingVo borrowingVo); + + + List getWindowPrintStatistics(WindowPrintVo windowPrintVo); + +} 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 11062634..4ac9bffb 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -67,6 +67,16 @@ public class Archive_Master_Vo { private String doctorInCharge; + private String doctorInCharge2; + + public String getDoctorInCharge2() { + return doctorInCharge2; + } + + public void setDoctorInCharge2(String doctorInCharge2) { + this.doctorInCharge2 = doctorInCharge2; + } + private String idNo; private String dischargeDisposition; diff --git a/src/main/java/com/emr/entity/Archive_otherVo.java b/src/main/java/com/emr/entity/Archive_otherVo.java new file mode 100644 index 00000000..966b00c7 --- /dev/null +++ b/src/main/java/com/emr/entity/Archive_otherVo.java @@ -0,0 +1,18 @@ +package com.emr.entity; + +import lombok.Data; + +@Data +public class Archive_otherVo { + private String inpNo; + private String visitId; + private String name; + private String dischargeDateTime; + private String admissionDateTime; + private String dTime; + private String C2; + private String deptAdmissionTo; + private String deptName; + private String startDate; + private String endDate; +} diff --git a/src/main/java/com/emr/entity/BorrowingVo.java b/src/main/java/com/emr/entity/BorrowingVo.java new file mode 100644 index 00000000..57278a5a --- /dev/null +++ b/src/main/java/com/emr/entity/BorrowingVo.java @@ -0,0 +1,20 @@ +package com.emr.entity; + +import lombok.Data; + +@Data +public class BorrowingVo { + + private String inpNo; + private String visitId; + private String name; + private String dischargeDateTime; + private String admissionDateTime; + private String deptAdmissionTo; + private String deptName; + private String startDate; + private String endDate; + private String applyTime; + private String applyerName; + private String disDeptName; +} diff --git a/src/main/java/com/emr/entity/FileVo.java b/src/main/java/com/emr/entity/FileVo.java new file mode 100644 index 00000000..a68e4f47 --- /dev/null +++ b/src/main/java/com/emr/entity/FileVo.java @@ -0,0 +1,20 @@ +package com.emr.entity; + +import lombok.Data; + +@Data +public class FileVo { + + private String inpNo; + private String visitId; + private String name; + private String dischargeDateTime; + private String admissionDateTime; + private String deptAdmissionTo; + private String deptName; + private String startDate; + private String endDate; + private String handleTime; + private String handleName; + private String ID; +} diff --git a/src/main/java/com/emr/entity/StatisticsVo.java b/src/main/java/com/emr/entity/StatisticsVo.java new file mode 100644 index 00000000..37011742 --- /dev/null +++ b/src/main/java/com/emr/entity/StatisticsVo.java @@ -0,0 +1,22 @@ +package com.emr.entity; + +import lombok.Data; + +@Data +public class StatisticsVo { + + private int recoveryNum; + private int fileNum; + private int borrowingNum; + private int selfHelpNum; + private int windowPrintNum; + private int vxPrintNum; + private int vxPrintNum1; + private int fuseNum; + private int fuseRecordNum; + private int paperlessNum; + private int paperlessPageNum; + private int scanningNum; + private int scanningPageNum; + +} diff --git a/src/main/java/com/emr/entity/WindowPrintVo.java b/src/main/java/com/emr/entity/WindowPrintVo.java new file mode 100644 index 00000000..e7ee450d --- /dev/null +++ b/src/main/java/com/emr/entity/WindowPrintVo.java @@ -0,0 +1,24 @@ +package com.emr.entity; + +import lombok.Data; + +@Data +public class WindowPrintVo { + + private String inpNo; + private String visitId; + private String name; + private String dischargeDateTime; + private String admissionDateTime; + private String deptAdmissionTo; + private String deptName; + private String startDate; + private String endDate; + private String printCreatetime; + private String printUserid; + private String applyTime; + private String printFlag; + private String printUserName; + + +} diff --git a/src/main/java/com/emr/service/StatisticsService.java b/src/main/java/com/emr/service/StatisticsService.java new file mode 100644 index 00000000..de7e2b02 --- /dev/null +++ b/src/main/java/com/emr/service/StatisticsService.java @@ -0,0 +1,19 @@ +package com.emr.service; + +import com.emr.entity.*; + +public interface StatisticsService { + + OffsetLimitPage getStatisticsVo(StatisticsVo statisticsVo, Integer offset, Integer limit); + + OffsetLimitPage getRecoveryStatistics(Archive_otherVo archiveOtherVo, Integer offset, Integer limit); + + OffsetLimitPage getFileStatistics(FileVo fileVo, Integer offset, Integer limit); + + + OffsetLimitPage getBorrowingStatistics(BorrowingVo borrowingVo, Integer offset, Integer limit); + + + OffsetLimitPage getWindowPrintStatistics(WindowPrintVo windowPrintVo, Integer offset, Integer limit); + +} 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 89b15bf8..ab102891 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -193,6 +193,36 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { List list = archiveMasterMapper.selectByColumn(archiveMasterVo); //设置医生、护士名称和打印标识、科室、是否退回医生、是否退回护士 setNameAndPrintFlag(archiveMasterVo, list); + if(list!=null && list.size()>0) { + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null){ + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + }}); + + for (Archive_Master_Vo emr_fault_vo : list) { + // emr_fault_vo.setBackFee(priceVal); + //主管医生 + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge()); + if (userInfo == null) { + emr_fault_vo.setDoctorInCharge(emr_fault_vo.getDoctorInCharge()); + } else { + emr_fault_vo.setDoctorInCharge(userInfo.getString("name")); + } + //退回人 + userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo == null) { + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + } else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + } + + } + } return list; } 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 164727cc..d4a21fea 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 @@ -350,7 +350,6 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { }}); for (Emr_Fault_Vo emr_fault_vo : list) { - // emr_fault_vo.setBackFee(priceVal); //主管医生 JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge()); if (userInfo == null) { diff --git a/src/main/java/com/emr/service/ipml/StatisticsServiceImpl.java b/src/main/java/com/emr/service/ipml/StatisticsServiceImpl.java new file mode 100644 index 00000000..8f4b0c83 --- /dev/null +++ b/src/main/java/com/emr/service/ipml/StatisticsServiceImpl.java @@ -0,0 +1,199 @@ +package com.emr.service.ipml; + +import com.alibaba.fastjson.JSONArray; +import com.emr.dao.StatisticsMapper; +import com.emr.entity.*; +import com.emr.service.Emr_DictionaryService; +import com.emr.service.PowerUserService; +import com.emr.service.StatisticsService; +import com.emr.vo.Power_User_Dto; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.List; + +@Service +@Transactional +public class StatisticsServiceImpl implements StatisticsService { + + @Autowired + StatisticsMapper statisticsMapper; + @Autowired + Emr_DictionaryService emrDictionaryService; + @Autowired + private PowerUserService powerUserService; + + + @Override + public OffsetLimitPage getStatisticsVo(StatisticsVo statisticsVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List statisticsVos = statisticsMapper.getStatisticsVo(statisticsVo); + for (StatisticsVo list:statisticsVos){ + int vxPrintNum = list.getVxPrintNum(); + int vxPrintNum1 = list.getVxPrintNum1(); + list.setVxPrintNum(vxPrintNum+vxPrintNum1); + int i = statisticsMapper.getpaperlessPageNum(); + list.setPaperlessPageNum(i); + } + return new OffsetLimitPage((Page) statisticsVos); + } + + @Override + public OffsetLimitPage getRecoveryStatistics(Archive_otherVo archiveOtherVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List recoveryStatistics = statisticsMapper.getRecoveryStatistics(archiveOtherVo); + Emr_Dictionary dic = new Emr_Dictionary(); + dic.setEffective(1); + dic.setTypecode("dept_code"); + //科室列表 + List dicList = emrDictionaryService.dicByTypeCode(dic); + for (int i = 0; i < recoveryStatistics.size(); i++) { + //替换科室 + for (int k = 0; k < dicList.size(); k++) { + String deptName = recoveryStatistics.get(i).getDeptName(); + //入院科室dept_admission_to + String dept2 = recoveryStatistics.get(i).getDeptAdmissionTo(); + + if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) { + //出院科室 + deptName = deptName.replace(deptName, dicList.get(k).getName()); + recoveryStatistics.get(i).setDeptName(deptName); + } + if (dept2 != null && dept2.equals(dicList.get(k).getCode())) { + //入院科室 + dept2 = dept2.replace(dept2, dicList.get(k).getName()); + recoveryStatistics.get(i).setDeptAdmissionTo(dept2); + } + } + } + return new OffsetLimitPage((Page) recoveryStatistics); + } + + @Override + public OffsetLimitPage getFileStatistics(FileVo fileVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List fileStatistics = statisticsMapper.getFileStatistics(fileVo); + Emr_Dictionary dic = new Emr_Dictionary(); + dic.setEffective(1); + dic.setTypecode("dept_code"); + //科室列表 + List dicList = emrDictionaryService.dicByTypeCode(dic); + for (int i = 0; i < fileStatistics.size(); i++) { + String masterId = fileStatistics.get(i).getID(); + FileVo fileHandle = statisticsMapper.gethandleName(masterId); + fileStatistics.get(i).setHandleTime(fileHandle.getHandleTime()); + fileStatistics.get(i).setHandleName(fileHandle.getHandleName()); + //替换科室 + for (int k = 0; k < dicList.size(); k++) { + String deptName = fileStatistics.get(i).getDeptName(); + //入院科室dept_admission_to + String dept2 = fileStatistics.get(i).getDeptAdmissionTo(); + + if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) { + //出院科室 + deptName = deptName.replace(deptName, dicList.get(k).getName()); + fileStatistics.get(i).setDeptName(deptName); + } + if (dept2 != null && dept2.equals(dicList.get(k).getCode())) { + //入院科室 + dept2 = dept2.replace(dept2, dicList.get(k).getName()); + fileStatistics.get(i).setDeptAdmissionTo(dept2); + } + } + } + return new OffsetLimitPage((Page) fileStatistics); + } + + @Override + public OffsetLimitPage getBorrowingStatistics(BorrowingVo borrowingVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List borrowingStatistics = statisticsMapper.getBorrowingStatistics(borrowingVo); + Emr_Dictionary dic = new Emr_Dictionary(); + dic.setEffective(1); + dic.setTypecode("dept_code"); + //科室列表 + List dicList = emrDictionaryService.dicByTypeCode(dic); + for (int i = 0; i < borrowingStatistics.size(); i++) { + //替换科室 + for (int k = 0; k < dicList.size(); k++) { + String deptName = borrowingStatistics.get(i).getDeptName(); + //入院科室dept_admission_to + String dept2 = borrowingStatistics.get(i).getDeptAdmissionTo(); + + if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) { + //出院科室 + deptName = deptName.replace(deptName, dicList.get(k).getName()); + borrowingStatistics.get(i).setDeptName(deptName); + } + if (dept2 != null && dept2.equals(dicList.get(k).getCode())) { + //入院科室 + dept2 = dept2.replace(dept2, dicList.get(k).getName()); + borrowingStatistics.get(i).setDeptAdmissionTo(dept2); + } + } + } + return new OffsetLimitPage((Page) borrowingStatistics); + } + + @Override + public OffsetLimitPage getWindowPrintStatistics(WindowPrintVo windowPrintVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List windowPrintStatistics = statisticsMapper.getWindowPrintStatistics(windowPrintVo); + Emr_Dictionary dic = new Emr_Dictionary(); + dic.setEffective(1); + dic.setTypecode("dept_code"); + //科室列表 + List dicList = emrDictionaryService.dicByTypeCode(dic); + for (int i = 0; i < windowPrintStatistics.size(); i++) { + //替换科室 + for (int k = 0; k < dicList.size(); k++) { + String deptName = windowPrintStatistics.get(i).getDeptName(); + //入院科室dept_admission_to + String dept2 = windowPrintStatistics.get(i).getDeptAdmissionTo(); + + if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) { + //出院科室 + deptName = deptName.replace(deptName, dicList.get(k).getName()); + windowPrintStatistics.get(i).setDeptName(deptName); + } + if (dept2 != null && dept2.equals(dicList.get(k).getCode())) { + //入院科室 + dept2 = dept2.replace(dept2, dicList.get(k).getName()); + windowPrintStatistics.get(i).setDeptAdmissionTo(dept2); + } + } + + + + //查询用户集合 + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = null; + if (!CollectionUtils.isEmpty(powerUsers)) { + //转换对象 + powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); + } + //遍历赋值 + for (WindowPrintVo emrFaultVo : windowPrintStatistics) { + if (null != powerUserList) { + //获取处理人 + String dealPerson = emrFaultVo.getPrintUserid(); + //遍历匹配工号赋值姓名 + for (Power_User_Dto powerUserDto : powerUserList) { + String name = powerUserDto.getName(); + if (StringUtils.isNotBlank(dealPerson) && powerUserDto.getUserName().equals(dealPerson)) { + emrFaultVo.setPrintUserName(name); + } + + } + } + } + } + return new OffsetLimitPage((Page) windowPrintStatistics) ; + + } +} diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 0d5d0934..99e1329d 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -1,7 +1,7 @@ #\u7559\u89C2\u63A8\u9001\u7B2C\u4E09\u65B9\u63A5\u53E3\u5730\u5740 observationRecordRequestUrl = http://10.162.0.51:8091/sanshuyun-ems-function/file/away/updateStatus #\u6A21\u5757\u6253\u56DE\u7B2C\u4E09\u65B9\u63A5\u53E3\u5730\u5740 -returnUrl = http://10.6.1.152:8085/SignWebService.asmx/PartrePair +returnUrl = http://10.6.1.152:8086/SignWebService.asmx/PartrePair #\u6A21\u5757\u6253\u56DE\u7B2C\u4E09\u65B9\u63A5\u53E3\u53C2\u6570 returnParam = strJson @@ -12,8 +12,7 @@ sqlServerUserName=sa sqlServerPassword=xjgs+docus911 - #\u7B2C\u4E09\u65B9oracle\u914D\u7F6E\u4FE1\u606F -oracleUrl = 10.6.0.150:1521/ORCL +oracleUrl = 10.6.0.150:1521/jhemr oracleUserName = jswzh -oraclePassWord = jswzh123 \ No newline at end of file +oraclePassWord = jswzh123 diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 1a3afdce..ee1b6ae4 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -386,9 +386,14 @@ and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR} - - - + + + and m.DOCTOR_IN_CHARGE in + + #{item} + + + and m.DOCTOR_IN_CHARGE in @@ -1423,7 +1428,7 @@ LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) g on m.dept_name=g.code - where 1=1 and f.following_type in(8,9) + where 1=1 and f.following_type in(8,9) and m.ArchiveState!='已封存' and m.id = #{id,jdbcType=NVARCHAR} @@ -1531,6 +1536,9 @@ and m.name like '%'+#{name,jdbcType=NCHAR}+'%' + + and m.death_flag=#{deathFlag,jdbcType=NCHAR} + and m.dept_name in @@ -1649,6 +1657,9 @@ and m.name like '%'+#{name,jdbcType=NCHAR}+'%' + + and m.death_flag=#{deathFlag,jdbcType=NCHAR} + and m.dept_name in diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml index 79ea1a75..171bf950 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -109,9 +109,6 @@ and m.name like '%'+#{name,jdbcType=NCHAR}+'%' - - - and m.ArchiveState in @@ -166,9 +163,6 @@ and f.recall_reason = #{recallReason,jdbcType=VARCHAR} - and f.creater in @@ -1062,7 +1056,7 @@ + select * from emr_statistics + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index fb6e84be..df3e3eb5 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -519,14 +519,12 @@ - <%--
- - -
--%> +
@@ -3786,15 +3784,6 @@ } var url = window.location.href; var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - // if (deptName != null && deptName != "") { - // //$("#deptName").hide(); - // deptName += "," + $("#deptName").val(); - // } else { - // deptName = $("#deptName").val(); - // } - // if ($("#deptName").val() != null && $("#deptName").val() != "") { - // deptName = $("#deptName").val(); - // } var len = ($("#deptName").val()).length; if (len > 0) { var deptNameT = $("#deptName").val(); @@ -3802,8 +3791,16 @@ deptName = $("#deptName").val().toString(); } } + var doctorInCharge = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); + var len = ($("#doctorInCharge").val()).length; + if (len > 0) { + var doctorInChargeT = $("#doctorInCharge").val(); + if (doctorInChargeT.indexOf("") == -1) { + doctorInCharge = $("#doctorInCharge").val().toString(); + } + } - //var doctorInCharge = $("#doctorInCharge").val().toString(); + // var doctorInCharge = $("#doctorInCharge").val().toString(); var temp = { limit: limit, //页面大小 offset: offset, //页码 @@ -3818,10 +3815,11 @@ startDateTo: $("#startDateTo").val(), endDateTo: $("#endDateTo").val(), deptName: deptName.toString(), - //doctorInCharge: doctorInCharge, + // doctorInCharge: doctorInCharge.toString(), emrCmit: $("#emrCmit").val(), bedNumber: $("#bedNumber").val(), - printNum:$("#printNum").val() + printNum:$("#printNum").val(), + doctorInCharge2:doctorInCharge.toString() }; return temp; }, @@ -4257,6 +4255,12 @@ return a; } }, + { + title: '主管医生', + field: 'doctorInCharge', + align: 'center', + valign: 'middle', + }, { title: '出院日期', field: 'dischargeDateTime', @@ -4618,6 +4622,29 @@ } } + + function getUserList() { + //获取role为病案室、病案室管理的用户 + $.ajax({ + url:"${path}/getPowerUserList", + type:"GET", + data:{"type":1}, + success:function (data) { + if (data != null) { + for (var i = 0; i < data.length; i++) { + $("#doctorInCharge").append(""); + $("#creater").append(""); + //$("#backer").append(""); + + } + } + $(".selectpicker").selectpicker('refresh'); + } + }) + } + + getUserList(); + function getSourceFun() { //console.log("获取来源下拉框：sourceSearch"); var patientId = $("#idLab").html(); @@ -5118,7 +5145,7 @@ deptName = $("#deptName").val().toString(); } } - //var doctorInCharge = $("#doctorInCharge").val().toString(); + // var doctorInCharge = $("#doctorInCharge").val().toString(); var inpNo = "" + $("#inpNo").val(); var visitId = "" + $("#visitId").val(); var name = "" + $("#name").val(); diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index 19c98359..06b69507 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -123,9 +123,7 @@ - <%----%>
@@ -295,6 +293,7 @@ doctorInCharge2=$("#doctorInCharge").val(); archivestate2=$("#archivestate").val(); deptName2=$("#deptName").val(); + creater2=$("#creater").val(); } function initTable() { if(tipLoad==1){ @@ -382,9 +381,9 @@ visitId:""+$("#visitId").val(), name:""+$("#name").val(), doctorInCharge:""+$("#doctorInCharge").val(), - //creater:""+$("#creater").val(), archivestate:"" + $("#archivestate").val(), - deptName: deptName + creater:"" + $("#creater").val(), + deptName: deptName, }; return temp; @@ -533,24 +532,22 @@ return value; //return changeDateFormat(value) } - } - /*{ - field: 'createTime', - title: '创建时间', - valign: 'middle', - formatter: function (value, row, index) { - return value; - //return changeDateFormat(value) - } }, { field: 'creater', title: '创建人', valign: 'middle', + } + /*{ + field: 'createTime', + title: '创建时间', + valign: 'middle', formatter: function (value, row, index) { return value; //return changeDateFormat(value) } + }, + },*/ // { // field: 'updater', @@ -823,7 +820,6 @@ order: params.order, //排位命令（desc，asc） archiveDetailId: archiveDetailId, startDateTo: startDateTo, - creater:""+$("#creater").val(), endDateTo: endDateTo, backFlag:"5,6", assortId:""+typeFlag @@ -944,6 +940,10 @@ inpNo2="" + $("#inpNo").val(); flag=1; } + if(creater2!=$("#creater").val() && flag==0){ + creater2="" + $("#creater").val(); + flag=1; + } //console.log("===flag2==="+flag ); if(visitId2!=$("#visitId").val() && flag==0){ visitId2=""+$("#visitId").val(); @@ -990,12 +990,12 @@ faultFlag=1; } //console.log("===faultFlag9==="+faultFlag); - if(creater2==$("#creater").val() && faultFlag==0){ - faultFlag=0; - }else{ - creater2=""+$("#creater").val(); - faultFlag=1; - } + // if(creater2==$("#creater").val() && faultFlag==0){ + // faultFlag=0; + // }else{ + // creater2=""+$("#creater").val(); + // faultFlag=1; + // } //console.log("===faultFlag10==="+faultFlag); return faultFlag; } @@ -1102,23 +1102,6 @@ } getDept(); - // var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - // if (deptAdmissionTo == null || deptAdmissionTo == '') { - // $('#deptDiv').show(); - // } else { - // $('#deptDiv').hide(); - // } - //初始化表 - - // $('.form_datetime').datetimepicker({ - // weekStart: 0, //一周从哪一天开始 - // todayBtn: 1, // - // autoclose: 1, - // todayHighlight: 1, - // startView: 2, - // forceParse: 0, - // showMeridian: 1 - // }); }); //日期控件 diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index 18e43972..303d9435 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -454,10 +454,6 @@
- <%--
--%> - <%----%> - <%----%> - <%--
--%>
--%> +
+ + +
@@ -242,6 +250,14 @@ --%> +
+ + +
diff --git a/src/main/webapp/WEB-INF/views/scientificResearch/borrowingStatistics.jsp b/src/main/webapp/WEB-INF/views/scientificResearch/borrowingStatistics.jsp new file mode 100644 index 00000000..06c8cee0 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/scientificResearch/borrowingStatistics.jsp @@ -0,0 +1,726 @@ +<%@ page import="java.util.ResourceBundle" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<% + ResourceBundle res = ResourceBundle.getBundle("config.jdbc"); +%> +<%--<%@ include file="/WEB-INF/jspf/common.jspf" %>--%> + + + 借阅 + + + + + + <%@include file="../../jspf/comm.jspf" %> + + + +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ +
+ + - + +
+
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+ + + +<%--确认框--%> + + + +<%--时间轴弹窗--%> + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/scientificResearch/fileStatistics.jsp b/src/main/webapp/WEB-INF/views/scientificResearch/fileStatistics.jsp new file mode 100644 index 00000000..ccf8a9c3 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/scientificResearch/fileStatistics.jsp @@ -0,0 +1,720 @@ +<%@ page import="java.util.ResourceBundle" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<% + ResourceBundle res = ResourceBundle.getBundle("config.jdbc"); +%> +<%--<%@ include file="/WEB-INF/jspf/common.jspf" %>--%> + + + 质控 + + + + + + <%@include file="../../jspf/comm.jspf" %> + + + +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ +
+ + - + +
+
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+ + + +<%--确认框--%> + + + +<%--时间轴弹窗--%> + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/scientificResearch/medicalRecordStatistics.jsp b/src/main/webapp/WEB-INF/views/scientificResearch/medicalRecordStatistics.jsp new file mode 100644 index 00000000..fa39312f --- /dev/null +++ b/src/main/webapp/WEB-INF/views/scientificResearch/medicalRecordStatistics.jsp @@ -0,0 +1,465 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + 病案统计 + + + + + + <%@include file="../../jspf/comm.jspf" %> + + + + +
+ + +
+ +
+ +
+
+
+
+ +
+ +
+ + +
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/scientificResearch/recoveryStatistics.jsp b/src/main/webapp/WEB-INF/views/scientificResearch/recoveryStatistics.jsp new file mode 100644 index 00000000..a6e7ec00 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/scientificResearch/recoveryStatistics.jsp @@ -0,0 +1,720 @@ +<%@ page import="java.util.ResourceBundle" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<% + ResourceBundle res = ResourceBundle.getBundle("config.jdbc"); +%> +<%--<%@ include file="/WEB-INF/jspf/common.jspf" %>--%> + + + 签收 + + + + + + <%@include file="../../jspf/comm.jspf" %> + + + +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ +
+ + - + +
+
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+ + + +<%--确认框--%> + + + +<%--时间轴弹窗--%> + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/scientificResearch/scientificTemplate.jsp b/src/main/webapp/WEB-INF/views/scientificResearch/scientificTemplate.jsp index c3d18218..17ea888f 100644 --- a/src/main/webapp/WEB-INF/views/scientificResearch/scientificTemplate.jsp +++ b/src/main/webapp/WEB-INF/views/scientificResearch/scientificTemplate.jsp @@ -102,6 +102,7 @@ + diff --git a/src/main/webapp/WEB-INF/views/scientificResearch/windowPrintStatistics.jsp b/src/main/webapp/WEB-INF/views/scientificResearch/windowPrintStatistics.jsp new file mode 100644 index 00000000..40ead844 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/scientificResearch/windowPrintStatistics.jsp @@ -0,0 +1,743 @@ +<%@ page import="java.util.ResourceBundle" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<% + ResourceBundle res = ResourceBundle.getBundle("config.jdbc"); +%> +<%--<%@ include file="/WEB-INF/jspf/common.jspf" %>--%> + + + 打印 + + + + + + <%@include file="../../jspf/comm.jspf" %> + + + +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ +
+ + - + +
+
+
+ + +
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+ + + +<%--确认框--%> + + + +<%--时间轴弹窗--%> + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index 79e6608e..e07c7b71 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -3379,20 +3379,20 @@ return html; } }, - { - title: '科主任是否审核', - field: 'checkFlag', - align: 'center', - formatter: function (value, row, index) { - var a = ""; - if (value == 9) { - a = '未审核'; - } else { - a = '已审核'; - } - return a; - } - }, + // { + // title: '科主任是否审核', + // field: 'checkFlag', + // align: 'center', + // formatter: function (value, row, index) { + // var a = ""; + // if (value == 9) { + // a = '未审核'; + // } else { + // a = '已审核'; + // } + // return a; + // } + // }, { title: '状态', field: 'archivestate',