From a2afd42fb2453df48bbbe08c81017ec35a53e214 Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Tue, 20 Jun 2023 11:21:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=9B=E6=B1=9F=E4=BC=98=E5=8C=96=E6=85=A2sq?= =?UTF-8?q?l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 + .../controller/MedicalRecallController.java | 2 + .../emr/controller/lastVerifyController.java | 16 + .../emr/controller/signListController.java | 377 ++-- .../com/emr/controller/storageController.java | 25 + .../java/com/emr/dao/AfCollectTaskMapper.java | 15 + .../com/emr/dao/Archive_DetailMapper.java | 2 + .../com/emr/dao/Archive_MasterMapper.java | 9 +- .../java/com/emr/entity/Archive_Master.java | 11 + .../com/emr/entity/Archive_Master_Vo.java | 2 + src/main/java/com/emr/entity/CommomVo.java | 1922 +++++++++++++++++ .../java/com/emr/entity/Emr_Fault_Detail.java | 11 + .../com/emr/service/AfCollectTaskService.java | 13 + .../emr/service/Archive_MasterService.java | 21 +- .../ipml/AfCollectTaskServiceImpl.java | 24 + .../ipml/Archive_DetailServiceImpl.java | 81 +- .../ipml/Archive_MasterServiceImpl.java | 16 +- src/main/resources/log4j.properties | 8 +- .../resources/mapper/AfCollectTaskMapper.xml | 7 + .../resources/mapper/Archive_DetailMapper.xml | 173 +- .../resources/mapper/Archive_MasterMapper.xml | 280 ++- .../mapper/Emr_Fault_DetailMapper.xml | 2 +- .../views/lastVerifyDir/lastVerifyList.jsp | 14 +- .../MedicalRecordStorage.jsp | 4 +- 24 files changed, 2743 insertions(+), 298 deletions(-) create mode 100644 src/main/java/com/emr/dao/AfCollectTaskMapper.java create mode 100644 src/main/java/com/emr/entity/CommomVo.java create mode 100644 src/main/java/com/emr/service/AfCollectTaskService.java create mode 100644 src/main/java/com/emr/service/ipml/AfCollectTaskServiceImpl.java create mode 100644 src/main/resources/mapper/AfCollectTaskMapper.xml diff --git a/pom.xml b/pom.xml index 6b1cc04f..9abf60bc 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,7 @@ 3.1.8 3.9 1.18.8 + 1.2.3 @@ -127,6 +128,11 @@ ${junit.version} test + + com.alibaba + fastjson + ${fastjson.version} + org.slf4j diff --git a/src/main/java/com/emr/controller/MedicalRecallController.java b/src/main/java/com/emr/controller/MedicalRecallController.java index 4f28de6c..3837cf2c 100644 --- a/src/main/java/com/emr/controller/MedicalRecallController.java +++ b/src/main/java/com/emr/controller/MedicalRecallController.java @@ -141,6 +141,8 @@ public class MedicalRecallController { archiveMaster.setArchivestate("初审"); bol=archiveMasterService.updateByClo(archiveMaster); if (bol == 1) { + //召回时删除commomtable对应数据 + archiveMasterService.deleteRecordByInp(emrFaultDetail.getArchiveDetailId()); //删除该病案号和state不为空的记录 bol = emrFaultDetailService.delByArchiveId(emrFaultDetail); //重新插入一条记录 diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index 900eb763..9e12e5a8 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -260,6 +260,22 @@ public class lastVerifyController { archiveMaster.setCmtDoctor(1); archiveMaster.setCmtNurse(1); int bol = archiveMasterService.updateByClo(archiveMaster); + //归档记录添加到commomtable表 + CommomVo commomVo = new CommomVo(); + List archiveMasters = archiveMasterService.selectCommonlyUsed(emrFaultDetail.getArchiveDetailId()); + for (Archive_Master list : archiveMasters) { + commomVo.setPatientId(list.getId()); + commomVo.setAdmissTimes(list.getVisitId()); + commomVo.setInpatientNo(list.getInpNo()); + commomVo.setName(list.getName()); + commomVo.setAdmissId(list.getPatientId()); + commomVo.setSex(list.getSex()); + commomVo.setAdmissDate(list.getAdmissionDateTime()); + commomVo.setDisDate(list.getDischargeDateTime()); + commomVo.setDisDept(list.getDeptName()); + commomVo.setAttending(list.getDoctorInCharge()); + archiveMasterService.insertCommonlyUsed(commomVo); + } //添加初审内容 if (bol == 1) { // 从session获取用户名 diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index a07d89fc..d902a20b 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.emr.entity.*; import com.emr.service.*; +import com.emr.util.HttpClientTool; import com.emr.util.IDHelper; import com.emr.util.ThreadExcelUtils; import com.emr.util.XMLUtil; @@ -32,15 +33,16 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; import javax.xml.rpc.ServiceException; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.math.BigDecimal; +import java.net.URL; +import java.net.URLConnection; import java.rmi.RemoteException; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Controller @RequestMapping("signList") @@ -74,6 +76,8 @@ public class signListController { @Autowired private FinishedDateTimeService finishedDateTimeService; + @Autowired + private AfCollectTaskService afCollectTaskService; @RequestMapping(value = "/signLists") public String faults(Model model) { @@ -125,7 +129,7 @@ public class signListController { @Transactional @ResponseBody @RequestMapping(value = "/delotherId") - public String delotherId(HttpServletRequest request, HttpServletResponse response,String id) { + public String delotherId(HttpServletRequest request, HttpServletResponse response, String id) { signListService.deleteSignListById(id); return "取消签收成功!"; } @@ -683,166 +687,223 @@ public class signListController { return result; } +// @ResponseBody +// @RequestMapping(value = "/collection") +// public String collection(HttpServletRequest request, HttpServletResponse response, int flagNum, String id, String pid) throws Exception { +// response.setCharacterEncoding("utf-8"); +// request.setCharacterEncoding("utf-8"); +// // 从session获取用户名 +// Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); +// String username = user.getUserName();//工号 +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// Date date_1801 = sdf.parse("1801-02-03 00:00:00"); +// +// //新增ext表数据逻辑 +// Archive_Master archive_master = archiveMasterService.selectById(id); +// if (archive_master != null) { +// //查ext表有无任务 +// ArchiveOtherExt archiveOtherExtParm = new ArchiveOtherExt(); +// archiveOtherExtParm.setMid(id); +// archiveOtherExtParm.setSysflag(-300); +// List extList = archiveOtherExtService.selectExtTaskIsExistOrNot(archiveOtherExtParm); +// if (!extList.isEmpty() && extList.size() == 1) { +// //有任务，则ext表更新statusFlag=0，对应C3-C8置空，T1-T6置空，其他不变 +// //1.statusFlag=0 +// extList.get(0).setStatusflag(0); +// //2.对应C3-C8置空，T1-T6置空 +// switch (flagNum) { +// //体温单 +// case 1: +// extList.get(0).setC5(""); +// extList.get(0).setT3(date_1801); +// break; +// //护理记录 +// case 2: +// extList.get(0).setC6(""); +// extList.get(0).setT4(date_1801); +// break; +// //首页 +// case 3: +// extList.get(0).setC3(""); +// extList.get(0).setT1(date_1801); +// break; +// //医生文书 +// case 4: +// extList.get(0).setC4(""); +// extList.get(0).setT2(date_1801); +// break; +// //评估单 +// case 5: +// extList.get(0).setC8(""); +// extList.get(0).setT6(date_1801); +// break; +// //护士文书 +// case 6: +// extList.get(0).setC7(""); +// extList.get(0).setT5(date_1801); +// break; +// } +// archiveOtherExtService.updateByPrimaryKeySelective(extList.get(0)); +// } else if (extList.isEmpty() || extList.size() < 0) { +// //无任务，则新增 +// OracleDateVo doctorNurseFinishedDatetime = finishedDateTimeService.findByID(archive_master.getInpNo(), archive_master.getVisitId()); +// //V6医生最后完成时间 +// String doctorFinishedDateTime = sdf.format(doctorNurseFinishedDatetime.getFinishedDateTime()); +// //V6护士最后完成时间 +// String nurseFinishedDateTime = sdf.format(doctorNurseFinishedDatetime.getMrCommitNurseDateTime()); +// ArchiveOtherExt archiveOtherExt = new ArchiveOtherExt(IDHelper.NewID(), new Date(), "按需采集", 0L, -300, date_1801, pid, +// archive_master.getInpNo(), date_1801, date_1801, 0, "", id, archive_master.getVisitId(), +// doctorFinishedDateTime, nurseFinishedDateTime, "Done", "Done", "Done", "Done", "Done", "Done", "", archive_master.getName(), +// BigDecimal.valueOf(0.0000), BigDecimal.valueOf(0.0000), BigDecimal.valueOf(0.0000), +// date_1801, date_1801, date_1801, date_1801, date_1801, date_1801); +// //对应C3-C8置空,T无需置空 +// switch (flagNum) { +// //体温单 +// case 1: +// archiveOtherExt.setC5(""); +// break; +// //护理记录 +// case 2: +// archiveOtherExt.setC6(""); +// break; +// //首页 +// case 3: +// archiveOtherExt.setC3(""); +// break; +// //医生文书 +// case 4: +// archiveOtherExt.setC4(""); +// break; +// //评估单 +// case 5: +// archiveOtherExt.setC8(""); +// break; +// //护士文书 +// case 6: +// archiveOtherExt.setC7(""); +// break; +// } +// archiveOtherExtService.insertSelective(archiveOtherExt); +// } else { +// //archive_Other_Ext表已经存在记录,且不只1条,删除多余或采集接口那边需要调整 +// return "同一个病案ID,ext表只允许1条数据!"; +// } +// } +// +// //新增other表数据逻辑 +// Sign_List signList = new Sign_List(); +// signList.setPid(pid); +// signList.setMasterID(id); +// int num = 0; +// switch (flagNum) { +// //体温单 +// case 1: +// num = -401; +// break; +// //护理记录 +// case 2: +// num = -402; +// break; +// //首页 +// case 3: +// num = -403; +// break; +// //医生文书 +// case 4: +// num = -404; +// break; +// //评估单 +// case 5: +// num = -405; +// break; +// //护士文书 +// case 6: +// num = -406; +// break; +// } +// signList.setSysFlag(num); +// signList.setC5("0"); +// List list = signListService.selectSignListWith(signList); +// if (list != null && list.size() > 0) { +// return "当前采集计划已存在，请勿重复发起!"; +// } else { +// signList.setId(IDHelper.NewID()); +// signList.setCreatedtime(sdf.format(new Date())); +// signList.setC1(username); +// signList.setIsFullText("0"); +// signList.setOtherInfo(""); +// signList.setDetailID(""); +// signList.setdTime(sdf.format(sdf.parse("1801-02-03 00:00:00"))); +// signList.setC2(""); +// signList.setC3(""); +// signList.setC4(""); +// signList.setN1(BigDecimal.valueOf(0.0000)); +// signList.setN2(BigDecimal.valueOf(0.0000)); +// signList.setN3(BigDecimal.valueOf(0.0000)); +// signList.setT1(sdf.format(sdf.parse("1801-02-03 00:00:00"))); +// signList.setT2(sdf.format(sdf.parse("1801-02-03 00:00:00"))); +// signList.setT3(sdf.format(sdf.parse("1801-02-03 00:00:00"))); +// signListService.insertSignList(signList); +// return "采集计划已生成!"; +// } +// } + + @ResponseBody @RequestMapping(value = "/collection") - public String collection(HttpServletRequest request, HttpServletResponse response, int flagNum, String id, String pid) throws Exception { - response.setCharacterEncoding("utf-8"); - request.setCharacterEncoding("utf-8"); - // 从session获取用户名 - Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); - String username = user.getUserName();//工号 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date_1801 = sdf.parse("1801-02-03 00:00:00"); + public String collection(HttpServletRequest request, HttpServletResponse response, int flagNum, String id) throws Exception { + String taskId = afCollectTaskService.getTaskId(flagNum, id); + String url="http://127.0.0.1:9296/api/noviewtask/UrgentMakeUp"; + String s = sendGet(url, taskId); + //查询新任务表id + return s; + } - //新增ext表数据逻辑 - Archive_Master archive_master = archiveMasterService.selectById(id); - if (archive_master != null) { - //查ext表有无任务 - ArchiveOtherExt archiveOtherExtParm = new ArchiveOtherExt(); - archiveOtherExtParm.setMid(id); - archiveOtherExtParm.setSysflag(-300); - List extList = archiveOtherExtService.selectExtTaskIsExistOrNot(archiveOtherExtParm); - if (!extList.isEmpty() && extList.size() == 1) { - //有任务，则ext表更新statusFlag=0，对应C3-C8置空，T1-T6置空，其他不变 - //1.statusFlag=0 - extList.get(0).setStatusflag(0); - //2.对应C3-C8置空，T1-T6置空 - switch (flagNum) { - //体温单 - case 1: - extList.get(0).setC5(""); - extList.get(0).setT3(date_1801); - break; - //护理记录 - case 2: - extList.get(0).setC6(""); - extList.get(0).setT4(date_1801); - break; - //首页 - case 3: - extList.get(0).setC3(""); - extList.get(0).setT1(date_1801); - break; - //医生文书 - case 4: - extList.get(0).setC4(""); - extList.get(0).setT2(date_1801); - break; - //评估单 - case 5: - extList.get(0).setC8(""); - extList.get(0).setT6(date_1801); - break; - //护士文书 - case 6: - extList.get(0).setC7(""); - extList.get(0).setT5(date_1801); - break; - } - archiveOtherExtService.updateByPrimaryKeySelective(extList.get(0)); - } else if (extList.isEmpty() || extList.size() < 0) { - //无任务，则新增 - OracleDateVo doctorNurseFinishedDatetime = finishedDateTimeService.findByID(archive_master.getInpNo(), archive_master.getVisitId()); - //V6医生最后完成时间 - String doctorFinishedDateTime = sdf.format(doctorNurseFinishedDatetime.getFinishedDateTime()); - //V6护士最后完成时间 - String nurseFinishedDateTime = sdf.format(doctorNurseFinishedDatetime.getMrCommitNurseDateTime()); - ArchiveOtherExt archiveOtherExt = new ArchiveOtherExt(IDHelper.NewID(), new Date(), "按需采集", 0L, -300, date_1801, pid, - archive_master.getInpNo(), date_1801, date_1801, 0, "", id, archive_master.getVisitId(), - doctorFinishedDateTime, nurseFinishedDateTime, "Done", "Done", "Done", "Done", "Done", "Done", "", archive_master.getName(), - BigDecimal.valueOf(0.0000), BigDecimal.valueOf(0.0000), BigDecimal.valueOf(0.0000), - date_1801, date_1801, date_1801, date_1801, date_1801, date_1801); - //对应C3-C8置空,T无需置空 - switch (flagNum) { - //体温单 - case 1: - archiveOtherExt.setC5(""); - break; - //护理记录 - case 2: - archiveOtherExt.setC6(""); - break; - //首页 - case 3: - archiveOtherExt.setC3(""); - break; - //医生文书 - case 4: - archiveOtherExt.setC4(""); - break; - //评估单 - case 5: - archiveOtherExt.setC8(""); - break; - //护士文书 - case 6: - archiveOtherExt.setC7(""); - break; - } - archiveOtherExtService.insertSelective(archiveOtherExt); - } else { - //archive_Other_Ext表已经存在记录,且不只1条,删除多余或采集接口那边需要调整 - return "同一个病案ID,ext表只允许1条数据!"; + public static String sendGet(String url, String param) { + String result = ""; + BufferedReader in = null; + try { + String urlNameString = url + "?" + param; + URL realUrl = new URL(urlNameString); + // 打开和URL之间的连接 + URLConnection connection = realUrl.openConnection(); + // 设置通用的请求属性 + connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("connection", "Keep-Alive"); + connection.setRequestProperty("user-agent", + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + // 建立实际的连接 + connection.connect(); + // 获取所有响应头字段 + Map> map = connection.getHeaderFields(); + // 遍历所有的响应头字段 + for (String key : map.keySet()) { + System.out.println(key + "--->" + map.get(key)); } + // 定义 BufferedReader输入流来读取URL的响应 + in = new BufferedReader(new InputStreamReader( + connection.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + System.out.println("发送GET请求出现异常！" + e); + e.printStackTrace(); } - - //新增other表数据逻辑 - Sign_List signList = new Sign_List(); - signList.setPid(pid); - signList.setMasterID(id); - int num = 0; - switch (flagNum) { - //体温单 - case 1: - num = -401; - break; - //护理记录 - case 2: - num = -402; - break; - //首页 - case 3: - num = -403; - break; - //医生文书 - case 4: - num = -404; - break; - //评估单 - case 5: - num = -405; - break; - //护士文书 - case 6: - num = -406; - break; - } - signList.setSysFlag(num); - signList.setC5("0"); - List list = signListService.selectSignListWith(signList); - if (list != null && list.size() > 0) { - return "当前采集计划已存在，请勿重复发起!"; - } else { - signList.setId(IDHelper.NewID()); - signList.setCreatedtime(sdf.format(new Date())); - signList.setC1(username); - signList.setIsFullText("0"); - signList.setOtherInfo(""); - signList.setDetailID(""); - signList.setdTime(sdf.format(sdf.parse("1801-02-03 00:00:00"))); - signList.setC2(""); - signList.setC3(""); - signList.setC4(""); - signList.setN1(BigDecimal.valueOf(0.0000)); - signList.setN2(BigDecimal.valueOf(0.0000)); - signList.setN3(BigDecimal.valueOf(0.0000)); - signList.setT1(sdf.format(sdf.parse("1801-02-03 00:00:00"))); - signList.setT2(sdf.format(sdf.parse("1801-02-03 00:00:00"))); - signList.setT3(sdf.format(sdf.parse("1801-02-03 00:00:00"))); - signListService.insertSignList(signList); - return "采集计划已生成!"; + // 使用finally块来关闭输入流 + finally { + try { + if (in != null) { + in.close(); + } + } catch (Exception e2) { + e2.printStackTrace(); + } } + return result; } + } diff --git a/src/main/java/com/emr/controller/storageController.java b/src/main/java/com/emr/controller/storageController.java index a8c4854f..2b18c4d2 100644 --- a/src/main/java/com/emr/controller/storageController.java +++ b/src/main/java/com/emr/controller/storageController.java @@ -6,11 +6,23 @@ */ package com.emr.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.emr.annotation.OptionalLog; import com.emr.entity.*; import com.emr.service.*; import com.emr.util.ThreadExcelUtils; +import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; +import org.apache.http.HttpRequest; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.message.BasicNameValuePair; import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; @@ -24,11 +36,19 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.io.UnsupportedEncodingException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import static com.emr.controller.signListController.sendGet; +import static com.emr.util.HttpClientTool.doPost; +import static com.emr.util.HttpClientUtils.doPostJson; +import static com.emr.util.HttpClientUtils.httpPost; + @PropertySource(value = "classpath:config/jdbc.properties", encoding = "UTF-8") @Controller @RequestMapping("/storage") @@ -164,6 +184,11 @@ public class storageController { archiveMasterFollowing.setHandleName(handleName); archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason()); bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing); + String url = "http://10.6.1.127:9295/api/NoViewCollect/generateTaskByPatientId"; + List list = new ArrayList(); + list.add(emrFaultDetail.getArchiveDetailId()); + String json = JSON.toJSONString(list); + doPostJson(url, json); } } else { return result; diff --git a/src/main/java/com/emr/dao/AfCollectTaskMapper.java b/src/main/java/com/emr/dao/AfCollectTaskMapper.java new file mode 100644 index 00000000..9bcea715 --- /dev/null +++ b/src/main/java/com/emr/dao/AfCollectTaskMapper.java @@ -0,0 +1,15 @@ +package com.emr.dao; + +import org.apache.ibatis.annotations.Param; + +/** + * @InterfaceName AfCollectTaskMapper + * @Description + * @Author linjj + * @Date 2023/5/4 16:35 + * @Version 1.0 + */ +public interface AfCollectTaskMapper { + + String getTaskId(@Param("flagNum")int flagNum, @Param("id")String id); +} diff --git a/src/main/java/com/emr/dao/Archive_DetailMapper.java b/src/main/java/com/emr/dao/Archive_DetailMapper.java index d2a3082a..a1a22f9e 100644 --- a/src/main/java/com/emr/dao/Archive_DetailMapper.java +++ b/src/main/java/com/emr/dao/Archive_DetailMapper.java @@ -119,6 +119,8 @@ public interface Archive_DetailMapper { */ List detailByClo(Archive_Detail_Vo record); + List detailByCloTop(Archive_Detail_Vo record); + /** * 根据可选字段查询记录详情 * @param record diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index e185bb64..99abebcd 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -3,6 +3,7 @@ package com.emr.dao; import com.emr.entity.Archive_Master; import com.emr.entity.Archive_Master_Following; import com.emr.entity.Archive_Master_Vo; +import com.emr.entity.CommomVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -64,6 +65,7 @@ public interface Archive_MasterMapper { */ List selectByLast(Archive_Master_Vo record); + /** * 根据可选字段查询查询病案示踪相关记录 * @param record @@ -114,7 +116,8 @@ public interface Archive_MasterMapper { */ int updateByClo(Archive_Master record); - + //根据id删除已归档数据 + int deleteRecordByInp(@Param("masterId")String masterId); /** * 根据条件查询记录 @@ -130,6 +133,10 @@ public interface Archive_MasterMapper { */ int updateById(Archive_Master record); + List selectCommonlyUsed(String id); + + int insertCommonlyUsed(CommomVo commomVo); + /** * * @param record diff --git a/src/main/java/com/emr/entity/Archive_Master.java b/src/main/java/com/emr/entity/Archive_Master.java index 2bfbccda..ebfc89e6 100644 --- a/src/main/java/com/emr/entity/Archive_Master.java +++ b/src/main/java/com/emr/entity/Archive_Master.java @@ -57,6 +57,14 @@ public class Archive_Master { private String emrDoctorCmt; + public String getDeptNameCode() { + return deptNameCode; + } + + public void setDeptNameCode(String deptNameCode) { + this.deptNameCode = deptNameCode; + } + private String emrNureCmt; private String deathFlag; @@ -68,6 +76,9 @@ public class Archive_Master { // 科室是否纸质提交 private String isscaned; + private String deptNameCode; + + //2020-1-13 新增扫描字段 private String isScanning; 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 4ac9bffb..f67cf3a2 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -140,6 +140,8 @@ public class Archive_Master_Vo { private String cmtNurseDate; + private Integer printFlag; + private String emrDoctorCmt; private String emrNureCmt; diff --git a/src/main/java/com/emr/entity/CommomVo.java b/src/main/java/com/emr/entity/CommomVo.java new file mode 100644 index 00000000..d59f1e18 --- /dev/null +++ b/src/main/java/com/emr/entity/CommomVo.java @@ -0,0 +1,1922 @@ +package com.emr.entity; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class CommomVo { + private String patientId; + + + private String admissTimes;//住院次数 + + private String inpatientNo;//病案号 + + private String name;//姓名 + + private String admissId;//住院号 + + public void setAdmissTimes(String admissTimes) { + this.admissTimes = admissTimes; + } + + public void setAge(String age) { + this.age = age; + } + + public void setAgeMonth(String ageMonth) { + this.ageMonth = ageMonth; + } + + private String sex;//性别 + + private String age;//年龄(岁) + + private String ageMonth;//年龄(月) + + private Short ageDay;//年龄(天) + + private String homeAddr;//家庭住址 + + private String nameCym;//姓名简写 + + private String admissDate;//住院日期 + + private String disDate;//出院日期 + + private Integer admissDays;//住院天数 + + private String disDept;//出院科室 + + private String isOper;//是否手术 + + private String attending;//主治医师 + + private String mainDiagCode;//主要诊断编码 + + private String mainDiagName;//主要诊断名称 + + private String mainDisThing;//主要诊断转归情况 + + private String memo;//病案备注 + + private String country;//国籍 + + private String birthAddr;//出生地 + + private String idCard;//身份证号 + + private String job;//职业 + + private String marriage;//婚况 + + private String homeTel;//家庭电话 + + private String homeZip;//家庭邮编 + + private String workName;//单位名称 + + private String workAddr;//工作地址 + + private String workTel;//工作电话 + + private String workZip;//工作邮编 + + private String linkman;//联系人 + + private String relation;//与联系人关系 + + private String relAddr;//联系人地址 + + private String relTel;//联系人电话 + + private String payType;//付费方式 + + private String birthday;//出生日期 + + private BigDecimal avoirdupois;//新生儿出生体重 + + private String admissType;//住院方式 + + private String admissDept;//住院科室 + + private String admissWard;//住院病房 + + private String changeDept;//转科科室 + + private String disWard;//出院病房 + + private String clinicDiag;//门诊诊断编码 + + private String clinicName;//门诊诊断名称 + + private String admissThing;//入院病情(暂无用) + + private String pathologyCode;//病理诊断编码 + + private String pathologyNo;//病理号 + + private String pathologyName;//病理诊断 + + private String medicine;//过敏药物 + + private String isMedicine;//是否药物过敏 + + private String emitPathology;//是否尸亡尸检 + + private String deptDirector;//科主任 + + private String director;//主任(副主任)医师 + + private String admissDoctor;//住院医师 + + private String refresher;//进修医师 + + private String praxis;//实习医师 + + private String coding;//编码员 + + private String quality;//病案质量 + + private String control;//质控医师 + + private String nurses;//质控护士 + + private String qualityDate;//质控日期 + + private String inputName;//输入员 + + private String inputCreateTime;//输入时间 + + private String bloodType;//血型 + + private String rh;//RH + + private Integer isShowDetail=0;//是否通过审批且时间未过期可查看 + + private Integer isDownload=0;//是否通过审批且时间未过期可下载 + + private Integer lockStatus=0;//锁定状态 + + private Integer editOper=0;//可修改 + + private Integer delOper=0;//可删除 + + private String diagCode;//诊断编号 + + private String diagName;//诊断名称 + + private String disThing;//转归情况 + + private String operateCode;//手术编码 + + private String operateName;//手术名称 + + private String operateDate;//手术时间 + + private String operator;//术者 + + private String assistant1;//助I + + private String assistant2;//助II + + private String operateClass;//手术级别 + + private String anaesthesiaType;//麻醉方式 + + private String cut;//切口愈合等级 + + private String anaesthesiaName;//麻醉医师 + + private String taintName;//院内感染病名 + + private String otherDiagName;//其他诊断的名称 + + private String admissTimesName;//住院次数中文 + + private Integer unlockOper;//解锁权限 + + private Integer borrowingOper;//申请借阅权限 + + private Integer downloadOper;//下载pdf权限 + + private Integer lockOper;//锁定权限 + + private String nativePlace;//籍贯 + + private String addr;//现住址 + + private String telphone;//手机号 + + private String zip;//现住址邮编 + + private String changeDate1;//转科1日期 + + private String changeDate2;//转科2日期 + + private String changeDate3;//转科3日期 + + private String changeDept1;//转科1 + + private String changeDept2;//转科2 + + private String changeDept3;//转科3 + + private String isHospitalization;//是否30天后再住院 + + private String hospitalizationObjective;//再住院目的 + + private Integer ryqhmDays;//颅脑损伤患者入院前昏迷天数 + + private Integer ryqhmHours;//颅脑损伤患者入院前昏迷小时数 + + private Integer ryqhmMins;//颅脑损伤患者入院前昏迷分钟数 + + private Integer ryhmDays;//颅脑损伤患者入院后昏迷天数 + + private Integer ryhmHours;//颅脑损伤患者入院后昏迷小时数 + + private Integer ryhmMins;//颅脑损伤患者入院后昏迷分钟数 + + private String isMedicalRecordPath;//是否有临床路径病例 + + private String responsibleNurse;//责任护士 + + private String birthWeight;//婴儿出生体重 + + private String breathing;//呼吸 + + private Integer rescueTimes;//抢救次数 + + private Integer rescueSuccessTimes;//抢救成功次数 + + private String tumorStagingType;//肿瘤分期类型 + + private String radiotherapyType;//放疗方式 + + private String radiotherapyProgram;//放疗程式 + + private String radiotherapyDevice;//放疗装置 + + private Integer primaryTumorDay;//放疗服药期间天数 + + private Integer primaryTumorTimes;//放疗服药期间每天次数 + + private String primaryTumorDose;//放疗服药期间每次剂量 + + private String primaryTumorStarttime;//放疗服药起始时间 + + private String primaryTumorEndtime;//放疗服药终止时间 + + private String chemotherapyType;//化疗方式 + + private String chemotherapyMethod;//化疗方法 + + private String startTime; + + private String endTime; + + private String drugNameAndDose; + + private String treatmentCourse; + + private String curativeEffect; + + private String caseType;//病历分型 + + private BigDecimal totalCharge;//住院总费用 + + private BigDecimal charge02;//护理费 + + private BigDecimal charge03;//西药费 + + private BigDecimal charge04;//中成药费 + + private BigDecimal charge05;//中草药费 + + private BigDecimal charge09;//血费 + + private BigDecimal charge10;//一般医疗服务费 + + private BigDecimal charge14;//麻醉费 + + private BigDecimal charge19;//手术费 + + private BigDecimal charge20;//综合医疗服务其他费用 + + private BigDecimal charge22;//自付金额 + + private BigDecimal charge25;//一般治疗操作费 + + private BigDecimal other;//其他费 + + private BigDecimal charge29;//病理诊断费 + + private BigDecimal charge30;//实验室诊断费 + + private BigDecimal charge31;//影像学诊断费 + + private BigDecimal charge32;//临床诊断项目费 + + private BigDecimal charge33;//非手术治疗项目费 + + private BigDecimal charge34;//临床物理治疗费 + + private BigDecimal charge35;//手术治疗项目总费用 + + private BigDecimal charge36;//康复费 + + private BigDecimal charge37;//抗菌药物费用 + + private BigDecimal charge38;//中医治疗费 + + private BigDecimal charge39;//白蛋白类制品费 + + private BigDecimal charge40;//球蛋白类制品费 + + private BigDecimal charge41;//凝血因子类制品费 + + private BigDecimal charge42;//细胞因子类制品费 + + private BigDecimal charge43;//检查用一次性医用材料费 + + private BigDecimal charge44;//治疗用一次性医用材料费 + + private BigDecimal charge45;//手术用一次性医用材料费 + + private String childbirthMothed;//分娩结果 + + private String diagType;//诊断类型 + + private String nation;//民族 + + private String clinicDoctor;//门诊医生 + + private String disType;//出院方式 + + private String transferHospitalName;//离院方式为医嘱转院，拟接收医疗机构名称 + + private String transferHealcenterName;//离院方式为转社区卫生服务器机构/乡镇卫生院，拟接收医疗机构名称 + + private BigDecimal birthbabyWeight;//新生儿入院体重 + + private String healthyCard;//健康卡号 + + private String saveTimes;//抢救次数 + + private String saveSuccessTimes;//抢救成功次数 + + private String chossurg;//是否择期手术 + + private String babyDiagType;//婴儿转归 + + private String checkedDatetime;// + + private String babySex; + + private String filePath;//脐血库、祈福医院影像图片目录 + + private String newPath;//新增图片目录 + + private String ph;//病历扫描盘号 + + private String gdh;//胶卷上的目录 + + private String clinicHerbDiag;//中医门诊icd + + private String clinicHerbName;//中医门诊病名 + + private String admissHerbDiag;//中医入院icd + + private String admissHerbName;//中医入院病名 + + private String admissDiag;//入院诊断idc + + private String admissName;//入院诊断名称 + + private String affirmDate;//确诊日期 + + private Integer delCount;//病案图片已删除的个数 + + private String paperPosition;//纸质位置 + + private String printStatus;//打印状态 + + + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getPaperPosition() { + return paperPosition; + } + + public void setPaperPosition(String paperPosition) { + this.paperPosition = paperPosition; + } + + public Integer getDelCount() { + return delCount; + } + + public void setDelCount(Integer delCount) { + this.delCount = delCount; + } + + public String getAffirmDate() { + return affirmDate; + } + + public void setAffirmDate(String affirmDate) { + this.affirmDate = affirmDate; + } + + public String getClinicHerbDiag() { + return clinicHerbDiag; + } + + public void setClinicHerbDiag(String clinicHerbDiag) { + this.clinicHerbDiag = clinicHerbDiag; + } + + public String getClinicHerbName() { + return clinicHerbName; + } + + public void setClinicHerbName(String clinicHerbName) { + this.clinicHerbName = clinicHerbName; + } + + public String getAdmissHerbDiag() { + return admissHerbDiag; + } + + public void setAdmissHerbDiag(String admissHerbDiag) { + this.admissHerbDiag = admissHerbDiag; + } + + public String getAdmissHerbName() { + return admissHerbName; + } + + public void setAdmissHerbName(String admissHerbName) { + this.admissHerbName = admissHerbName; + } + + public String getAdmissDiag() { + return admissDiag; + } + + public void setAdmissDiag(String admissDiag) { + this.admissDiag = admissDiag; + } + + public String getAdmissName() { + return admissName; + } + + public void setAdmissName(String admissName) { + this.admissName = admissName; + } + + public String getPh() { + return ph; + } + + public void setPh(String ph) { + this.ph = ph; + } + + public String getGdh() { + return gdh; + } + + public void setGdh(String gdh) { + this.gdh = gdh; + } + + public String getMainDiagCode() { + return mainDiagCode; + } + + public void setMainDiagCode(String mainDiagCode) { + this.mainDiagCode = mainDiagCode; + } + + public String getMemo() { + return memo; + } + + public void setMemo(String memo) { + this.memo = memo; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public String getNewPath() { + return newPath; + } + + public void setNewPath(String newPath) { + this.newPath = newPath; + } + + public String getTransferHospitalName() { + return transferHospitalName; + } + + public void setTransferHospitalName(String transferHospitalName) { + this.transferHospitalName = transferHospitalName; + } + + public String getTransferHealcenterName() { + return transferHealcenterName; + } + + public void setTransferHealcenterName(String transferHealcenterName) { + this.transferHealcenterName = transferHealcenterName; + } + + public String getPathologyNo() { + return pathologyNo; + } + + public void setPathologyNo(String pathologyNo) { + this.pathologyNo = pathologyNo; + } + + public String getPathologyCode() { + return pathologyCode; + } + + public void setPathologyCode(String pathologyCode) { + this.pathologyCode = pathologyCode; + } + + public String getInputCreateTime() { + return inputCreateTime; + } + + public void setInputCreateTime(String inputCreateTime) { + this.inputCreateTime = inputCreateTime; + } + + public String getInputName() { + return inputName; + } + + public void setInputName(String inputName) { + this.inputName = inputName; + } + + public String getWorkName() { + return workName; + } + + public void setWorkName(String workName) { + this.workName = workName; + } + + public String getPathologyName() { + return pathologyName; + } + + public void setPathologyName(String pathologyName) { + this.pathologyName = pathologyName; + } + + public String getSaveTimes() { + return saveTimes; + } + + public String getHealthyCard() { + return healthyCard; + } + + public void setHealthyCard(String healthyCard) { + this.healthyCard = healthyCard; + } + + public void setSaveTimes(String saveTimes) { + this.saveTimes = saveTimes; + } + + public String getSaveSuccessTimes() { + return saveSuccessTimes; + } + + public void setSaveSuccessTimes(String saveSuccessTimes) { + this.saveSuccessTimes = saveSuccessTimes; + } + + public String getBabySex() { + return babySex; + } + + public void setBabySex(String babySex) { + this.babySex = babySex; + } + + public String getCheckedDatetime() { + return checkedDatetime; + } + + public void setCheckedDatetime(String checkedDatetime) { + this.checkedDatetime = checkedDatetime; + } + + public String getBabyDiagType() { + return babyDiagType; + } + + public void setBabyDiagType(String babyDiagType) { + this.babyDiagType = babyDiagType; + } + + public String getChossurg() { + return chossurg; + } + + public void setChossurg(String chossurg) { + this.chossurg = chossurg; + } + + public BigDecimal getBirthbabyWeight() { + return birthbabyWeight; + } + + public void setBirthbabyWeight(BigDecimal birthbabyWeight) { + this.birthbabyWeight = birthbabyWeight; + } + + public String getNativePlace() { + return nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getAddr() { + return addr; + } + + public void setAddr(String addr) { + this.addr = addr; + } + + public String getTelphone() { + return telphone; + } + + public void setTelphone(String telphone) { + this.telphone = telphone; + } + + public String getZip() { + return zip; + } + + public void setZip(String zip) { + this.zip = zip; + } + + public String getChangeDate1() { + return changeDate1; + } + + public void setChangeDate1(String changeDate1) { + this.changeDate1 = changeDate1; + } + + public String getChangeDate2() { + return changeDate2; + } + + public void setChangeDate2(String changeDate2) { + this.changeDate2 = changeDate2; + } + + public String getChangeDate3() { + return changeDate3; + } + + public void setChangeDate3(String changeDate3) { + this.changeDate3 = changeDate3; + } + + public String getChangeDept1() { + return changeDept1; + } + + public void setChangeDept1(String changeDept1) { + this.changeDept1 = changeDept1; + } + + public String getChangeDept2() { + return changeDept2; + } + + public void setChangeDept2(String changeDept2) { + this.changeDept2 = changeDept2; + } + + public String getChangeDept3() { + return changeDept3; + } + + public void setChangeDept3(String changeDept3) { + this.changeDept3 = changeDept3; + } + + public String getIsHospitalization() { + return isHospitalization; + } + + public void setIsHospitalization(String isHospitalization) { + this.isHospitalization = isHospitalization; + } + + public String getHospitalizationObjective() { + return hospitalizationObjective; + } + + public void setHospitalizationObjective(String hospitalizationObjective) { + this.hospitalizationObjective = hospitalizationObjective; + } + + public Integer getRyqhmDays() { + return ryqhmDays; + } + + public void setRyqhmDays(Integer ryqhmDays) { + this.ryqhmDays = ryqhmDays; + } + + public Integer getRyqhmHours() { + return ryqhmHours; + } + + public void setRyqhmHours(Integer ryqhmHours) { + this.ryqhmHours = ryqhmHours; + } + + public Integer getRyqhmMins() { + return ryqhmMins; + } + + public void setRyqhmMins(Integer ryqhmMins) { + this.ryqhmMins = ryqhmMins; + } + + public Integer getRyhmDays() { + return ryhmDays; + } + + public void setRyhmDays(Integer ryhmDays) { + this.ryhmDays = ryhmDays; + } + + public Integer getRyhmHours() { + return ryhmHours; + } + + public void setRyhmHours(Integer ryhmHours) { + this.ryhmHours = ryhmHours; + } + + public Integer getRyhmMins() { + return ryhmMins; + } + + public void setRyhmMins(Integer ryhmMins) { + this.ryhmMins = ryhmMins; + } + + public String getIsMedicalRecordPath() { + return isMedicalRecordPath; + } + + public void setIsMedicalRecordPath(String isMedicalRecordPath) { + this.isMedicalRecordPath = isMedicalRecordPath; + } + + public String getResponsibleNurse() { + return responsibleNurse; + } + + public void setResponsibleNurse(String responsibleNurse) { + this.responsibleNurse = responsibleNurse; + } + + public String getBirthWeight() { + return birthWeight; + } + + public void setBirthWeight(String birthWeight) { + this.birthWeight = birthWeight; + } + + public String getBreathing() { + return breathing; + } + + public void setBreathing(String breathing) { + this.breathing = breathing; + } + + public Integer getRescueTimes() { + return rescueTimes; + } + + public void setRescueTimes(Integer rescueTimes) { + this.rescueTimes = rescueTimes; + } + + public Integer getRescueSuccessTimes() { + return rescueSuccessTimes; + } + + public void setRescueSuccessTimes(Integer rescueSuccessTimes) { + this.rescueSuccessTimes = rescueSuccessTimes; + } + + public String getTumorStagingType() { + return tumorStagingType; + } + + public void setTumorStagingType(String tumorStagingType) { + this.tumorStagingType = tumorStagingType; + } + + public String getRadiotherapyType() { + return radiotherapyType; + } + + public void setRadiotherapyType(String radiotherapyType) { + this.radiotherapyType = radiotherapyType; + } + + public String getRadiotherapyProgram() { + return radiotherapyProgram; + } + + public void setRadiotherapyProgram(String radiotherapyProgram) { + this.radiotherapyProgram = radiotherapyProgram; + } + + public String getRadiotherapyDevice() { + return radiotherapyDevice; + } + + public void setRadiotherapyDevice(String radiotherapyDevice) { + this.radiotherapyDevice = radiotherapyDevice; + } + + public Integer getPrimaryTumorDay() { + return primaryTumorDay; + } + + public void setPrimaryTumorDay(Integer primaryTumorDay) { + this.primaryTumorDay = primaryTumorDay; + } + + public Integer getPrimaryTumorTimes() { + return primaryTumorTimes; + } + + public void setPrimaryTumorTimes(Integer primaryTumorTimes) { + this.primaryTumorTimes = primaryTumorTimes; + } + + public String getPrimaryTumorDose() { + return primaryTumorDose; + } + + public void setPrimaryTumorDose(String primaryTumorDose) { + this.primaryTumorDose = primaryTumorDose; + } + + public String getPrimaryTumorStarttime() { + return primaryTumorStarttime; + } + + public void setPrimaryTumorStarttime(String primaryTumorStarttime) { + this.primaryTumorStarttime = primaryTumorStarttime; + } + + public String getPrimaryTumorEndtime() { + return primaryTumorEndtime; + } + + public void setPrimaryTumorEndtime(String primaryTumorEndtime) { + this.primaryTumorEndtime = primaryTumorEndtime; + } + + public String getChemotherapyType() { + return chemotherapyType; + } + + public void setChemotherapyType(String chemotherapyType) { + this.chemotherapyType = chemotherapyType; + } + + public String getChemotherapyMethod() { + return chemotherapyMethod; + } + + public void setChemotherapyMethod(String chemotherapyMethod) { + this.chemotherapyMethod = chemotherapyMethod; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDrugNameAndDose() { + return drugNameAndDose; + } + + public void setDrugNameAndDose(String drugNameAndDose) { + this.drugNameAndDose = drugNameAndDose; + } + + public String getTreatmentCourse() { + return treatmentCourse; + } + + public void setTreatmentCourse(String treatmentCourse) { + this.treatmentCourse = treatmentCourse; + } + + public String getCurativeEffect() { + return curativeEffect; + } + + public void setCurativeEffect(String curativeEffect) { + this.curativeEffect = curativeEffect; + } + + public String getCaseType() { + return caseType; + } + + public void setCaseType(String caseType) { + this.caseType = caseType; + } + + public BigDecimal getTotalCharge() { + return totalCharge; + } + + public void setTotalCharge(BigDecimal totalCharge) { + this.totalCharge = totalCharge; + } + + public BigDecimal getCharge02() { + return charge02; + } + + public void setCharge02(BigDecimal charge02) { + this.charge02 = charge02; + } + + public BigDecimal getCharge03() { + return charge03; + } + + public void setCharge03(BigDecimal charge03) { + this.charge03 = charge03; + } + + public BigDecimal getCharge04() { + return charge04; + } + + public void setCharge04(BigDecimal charge04) { + this.charge04 = charge04; + } + + public BigDecimal getCharge05() { + return charge05; + } + + public void setCharge05(BigDecimal charge05) { + this.charge05 = charge05; + } + + public BigDecimal getCharge09() { + return charge09; + } + + public void setCharge09(BigDecimal charge09) { + this.charge09 = charge09; + } + + public BigDecimal getCharge10() { + return charge10; + } + + public void setCharge10(BigDecimal charge10) { + this.charge10 = charge10; + } + + public BigDecimal getCharge14() { + return charge14; + } + + public void setCharge14(BigDecimal charge14) { + this.charge14 = charge14; + } + + public BigDecimal getCharge19() { + return charge19; + } + + public void setCharge19(BigDecimal charge19) { + this.charge19 = charge19; + } + + public BigDecimal getCharge20() { + return charge20; + } + + public void setCharge20(BigDecimal charge20) { + this.charge20 = charge20; + } + + public BigDecimal getCharge22() { + return charge22; + } + + public void setCharge22(BigDecimal charge22) { + this.charge22 = charge22; + } + + public BigDecimal getCharge25() { + return charge25; + } + + public void setCharge25(BigDecimal charge25) { + this.charge25 = charge25; + } + + public BigDecimal getOther() { + return other; + } + + public void setOther(BigDecimal other) { + this.other = other; + } + + public BigDecimal getCharge29() { + return charge29; + } + + public void setCharge29(BigDecimal charge29) { + this.charge29 = charge29; + } + + public BigDecimal getCharge30() { + return charge30; + } + + public void setCharge30(BigDecimal charge30) { + this.charge30 = charge30; + } + + public BigDecimal getCharge31() { + return charge31; + } + + public void setCharge31(BigDecimal charge31) { + this.charge31 = charge31; + } + + public BigDecimal getCharge32() { + return charge32; + } + + public void setCharge32(BigDecimal charge32) { + this.charge32 = charge32; + } + + public BigDecimal getCharge33() { + return charge33; + } + + public void setCharge33(BigDecimal charge33) { + this.charge33 = charge33; + } + + public BigDecimal getCharge34() { + return charge34; + } + + public void setCharge34(BigDecimal charge34) { + this.charge34 = charge34; + } + + public BigDecimal getCharge35() { + return charge35; + } + + public void setCharge35(BigDecimal charge35) { + this.charge35 = charge35; + } + + public BigDecimal getCharge36() { + return charge36; + } + + public void setCharge36(BigDecimal charge36) { + this.charge36 = charge36; + } + + public BigDecimal getCharge37() { + return charge37; + } + + public void setCharge37(BigDecimal charge37) { + this.charge37 = charge37; + } + + public BigDecimal getCharge38() { + return charge38; + } + + public void setCharge38(BigDecimal charge38) { + this.charge38 = charge38; + } + + public BigDecimal getCharge39() { + return charge39; + } + + public void setCharge39(BigDecimal charge39) { + this.charge39 = charge39; + } + + public BigDecimal getCharge40() { + return charge40; + } + + public void setCharge40(BigDecimal charge40) { + this.charge40 = charge40; + } + + public BigDecimal getCharge41() { + return charge41; + } + + public void setCharge41(BigDecimal charge41) { + this.charge41 = charge41; + } + + public BigDecimal getCharge42() { + return charge42; + } + + public void setCharge42(BigDecimal charge42) { + this.charge42 = charge42; + } + + public BigDecimal getCharge43() { + return charge43; + } + + public void setCharge43(BigDecimal charge43) { + this.charge43 = charge43; + } + + public BigDecimal getCharge44() { + return charge44; + } + + public void setCharge44(BigDecimal charge44) { + this.charge44 = charge44; + } + + public BigDecimal getCharge45() { + return charge45; + } + + public void setCharge45(BigDecimal charge45) { + this.charge45 = charge45; + } + + public String getChildbirthMothed() { + return childbirthMothed; + } + + public void setChildbirthMothed(String childbirthMothed) { + this.childbirthMothed = childbirthMothed; + } + + public String getDiagType() { + return diagType; + } + + public void setDiagType(String diagType) { + this.diagType = diagType; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getClinicDoctor() { + return clinicDoctor; + } + + public void setClinicDoctor(String clinicDoctor) { + this.clinicDoctor = clinicDoctor; + } + + public String getDisType() { + return disType; + } + + public void setDisType(String disType) { + this.disType = disType; + } + + public Integer getUnlockOper() { + return unlockOper; + } + + public void setUnlockOper(Integer unlockOper) { + this.unlockOper = unlockOper; + } + + public Integer getBorrowingOper() { + return borrowingOper; + } + + public void setBorrowingOper(Integer borrowingOper) { + this.borrowingOper = borrowingOper; + } + + public Integer getLockOper() { + return lockOper; + } + + public void setLockOper(Integer lockOper) { + this.lockOper = lockOper; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + + + public String getInpatientNo() { + return inpatientNo; + } + + public void setInpatientNo(String inpatientNo) { + this.inpatientNo = inpatientNo; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAdmissId() { + return admissId; + } + + public void setAdmissId(String admissId) { + this.admissId = admissId; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + + public Short getAgeDay() { + return ageDay; + } + + public void setAgeDay(Short ageDay) { + this.ageDay = ageDay; + } + + public String getHomeAddr() { + return homeAddr; + } + + public void setHomeAddr(String homeAddr) { + this.homeAddr = homeAddr; + } + + public String getNameCym() { + return nameCym; + } + + public void setNameCym(String nameCym) { + this.nameCym = nameCym; + } + + public String getAdmissDate() { + return admissDate; + } + + public void setAdmissDate(String admissDate) { + this.admissDate = admissDate; + } + + public String getDisDate() { + return disDate; + } + + public void setDisDate(String disDate) { + this.disDate = disDate; + } + + public Integer getAdmissDays() { + return admissDays; + } + + public void setAdmissDays(Integer admissDays) { + this.admissDays = admissDays; + } + + public String getDisDept() { + return disDept; + } + + public void setDisDept(String disDept) { + this.disDept = disDept; + } + + public String getIsOper() { + return isOper; + } + + public void setIsOper(String isOper) { + this.isOper = isOper; + } + + public String getAttending() { + return attending; + } + + public void setAttending(String attending) { + this.attending = attending; + } + + public String getMainDiagName() { + return mainDiagName; + } + + public void setMainDiagName(String mainDiagName) { + this.mainDiagName = mainDiagName; + } + + public String getMainDisThing() { + return mainDisThing; + } + + public void setMainDisThing(String mainDisThing) { + this.mainDisThing = mainDisThing; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getBirthAddr() { + return birthAddr; + } + + public void setBirthAddr(String birthAddr) { + this.birthAddr = birthAddr; + } + + public String getIdCard() { + return idCard; + } + + public void setIdCard(String idCard) { + this.idCard = idCard; + } + + public String getJob() { + return job; + } + + public void setJob(String job) { + this.job = job; + } + + public String getMarriage() { + return marriage; + } + + public void setMarriage(String marriage) { + this.marriage = marriage; + } + + public String getHomeTel() { + return homeTel; + } + + public void setHomeTel(String homeTel) { + this.homeTel = homeTel; + } + + public String getHomeZip() { + return homeZip; + } + + public void setHomeZip(String homeZip) { + this.homeZip = homeZip; + } + + public String getWorkAddr() { + return workAddr; + } + + public void setWorkAddr(String workAddr) { + this.workAddr = workAddr; + } + + public String getWorkTel() { + return workTel; + } + + public void setWorkTel(String workTel) { + this.workTel = workTel; + } + + public String getWorkZip() { + return workZip; + } + + public void setWorkZip(String workZip) { + this.workZip = workZip; + } + + public String getLinkman() { + return linkman; + } + + public void setLinkman(String linkman) { + this.linkman = linkman; + } + + public String getRelation() { + return relation; + } + + public void setRelation(String relation) { + this.relation = relation; + } + + public String getRelAddr() { + return relAddr; + } + + public void setRelAddr(String relAddr) { + this.relAddr = relAddr; + } + + public String getRelTel() { + return relTel; + } + + public void setRelTel(String relTel) { + this.relTel = relTel; + } + + public String getPayType() { + return payType; + } + + public void setPayType(String payType) { + this.payType = payType; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public BigDecimal getAvoirdupois() { + return avoirdupois; + } + + public void setAvoirdupois(BigDecimal avoirdupois) { + this.avoirdupois = avoirdupois; + } + + public String getAdmissType() { + return admissType; + } + + public void setAdmissType(String admissType) { + this.admissType = admissType; + } + + public String getAdmissDept() { + return admissDept; + } + + public void setAdmissDept(String admissDept) { + this.admissDept = admissDept; + } + + public String getAdmissWard() { + return admissWard; + } + + public void setAdmissWard(String admissWard) { + this.admissWard = admissWard; + } + + public String getChangeDept() { + return changeDept; + } + + public void setChangeDept(String changeDept) { + this.changeDept = changeDept; + } + + public String getDisWard() { + return disWard; + } + + public void setDisWard(String disWard) { + this.disWard = disWard; + } + + public String getClinicDiag() { + return clinicDiag; + } + + public void setClinicDiag(String clinicDiag) { + this.clinicDiag = clinicDiag; + } + + public String getClinicName() { + return clinicName; + } + + public void setClinicName(String clinicName) { + this.clinicName = clinicName; + } + + public String getAdmissThing() { + return admissThing; + } + + public void setAdmissThing(String admissThing) { + this.admissThing = admissThing; + } + + public String getMedicine() { + return medicine; + } + + public void setMedicine(String medicine) { + this.medicine = medicine; + } + + public String getIsMedicine() { + return isMedicine; + } + + public void setIsMedicine(String isMedicine) { + this.isMedicine = isMedicine; + } + + public String getEmitPathology() { + return emitPathology; + } + + public void setEmitPathology(String emitPathology) { + this.emitPathology = emitPathology; + } + + public String getDeptDirector() { + return deptDirector; + } + + public void setDeptDirector(String deptDirector) { + this.deptDirector = deptDirector; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getAdmissDoctor() { + return admissDoctor; + } + + public void setAdmissDoctor(String admissDoctor) { + this.admissDoctor = admissDoctor; + } + + public String getRefresher() { + return refresher; + } + + public void setRefresher(String refresher) { + this.refresher = refresher; + } + + public String getPraxis() { + return praxis; + } + + public void setPraxis(String praxis) { + this.praxis = praxis; + } + + public String getCoding() { + return coding; + } + + public void setCoding(String coding) { + this.coding = coding; + } + + public String getQuality() { + return quality; + } + + public void setQuality(String quality) { + this.quality = quality; + } + + public String getControl() { + return control; + } + + public void setControl(String control) { + this.control = control; + } + + public String getNurses() { + return nurses; + } + + public void setNurses(String nurses) { + this.nurses = nurses; + } + + public String getQualityDate() { + return qualityDate; + } + + public void setQualityDate(String qualityDate) { + this.qualityDate = qualityDate; + } + + public String getBloodType() { + return bloodType; + } + + public void setBloodType(String bloodType) { + this.bloodType = bloodType; + } + + public String getRh() { + return rh; + } + + public void setRh(String rh) { + this.rh = rh; + } + + public Integer getIsShowDetail() { + return isShowDetail; + } + + public void setIsShowDetail(Integer isShowDetail) { + this.isShowDetail = isShowDetail; + } + + public Integer getLockStatus() { + return lockStatus; + } + + public void setLockStatus(Integer lockStatus) { + this.lockStatus = lockStatus; + } + + public String getDiagCode() { + return diagCode; + } + + public void setDiagCode(String diagCode) { + this.diagCode = diagCode; + } + + public String getDiagName() { + return diagName; + } + + public void setDiagName(String diagName) { + this.diagName = diagName; + } + + public String getDisThing() { + return disThing; + } + + public void setDisThing(String disThing) { + this.disThing = disThing; + } + + public String getOperateCode() { + return operateCode; + } + + public void setOperateCode(String operateCode) { + this.operateCode = operateCode; + } + + public String getOperateName() { + return operateName; + } + + public void setOperateName(String operateName) { + this.operateName = operateName; + } + + public String getOperateDate() { + return operateDate; + } + + public void setOperateDate(String operateDate) { + this.operateDate = operateDate; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + public String getAssistant1() { + return assistant1; + } + + public void setAssistant1(String assistant1) { + this.assistant1 = assistant1; + } + + public String getAssistant2() { + return assistant2; + } + + public void setAssistant2(String assistant2) { + this.assistant2 = assistant2; + } + + public String getOperateClass() { + return operateClass; + } + + public void setOperateClass(String operateClass) { + this.operateClass = operateClass; + } + + public String getAnaesthesiaType() { + return anaesthesiaType; + } + + public void setAnaesthesiaType(String anaesthesiaType) { + this.anaesthesiaType = anaesthesiaType; + } + + public String getCut() { + return cut; + } + + public void setCut(String cut) { + this.cut = cut; + } + + public String getAnaesthesiaName() { + return anaesthesiaName; + } + + public void setAnaesthesiaName(String anaesthesiaName) { + this.anaesthesiaName = anaesthesiaName; + } + + public String getTaintName() { + return taintName; + } + + public void setTaintName(String taintName) { + this.taintName = taintName; + } + + public String getOtherDiagName() { + return otherDiagName; + } + + public void setOtherDiagName(String otherDiagName) { + this.otherDiagName = otherDiagName; + } + + public String getAdmissTimesName() { + return admissTimesName; + } + + public void setAdmissTimesName(String admissTimesName) { + this.admissTimesName = admissTimesName; + } + + public Integer getDownloadOper() { + return downloadOper; + } + + public void setDownloadOper(Integer downloadOper) { + this.downloadOper = downloadOper; + } + + public Integer getIsDownload() { + return isDownload; + } + + public void setIsDownload(Integer isDownload) { + this.isDownload = isDownload; + } + + public Integer getEditOper() { + return editOper; + } + + public void setEditOper(Integer editOper) { + this.editOper = editOper; + } + + public Integer getDelOper() { + return delOper; + } + + public void setDelOper(Integer delOper) { + this.delOper = delOper; + } +} \ No newline at end of file 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 ead4fb90..a4e7a0ad 100644 --- a/src/main/java/com/emr/entity/Emr_Fault_Detail.java +++ b/src/main/java/com/emr/entity/Emr_Fault_Detail.java @@ -8,6 +8,17 @@ public class Emr_Fault_Detail { private String ArchiveStateFlag; private Integer idPage; + + private String StateFlag; + + public String getStateFlag() { + return StateFlag; + } + + public void setStateFlag(String stateFlag) { + StateFlag = stateFlag; + } + public String getArchiveStateFlag() { return ArchiveStateFlag; } diff --git a/src/main/java/com/emr/service/AfCollectTaskService.java b/src/main/java/com/emr/service/AfCollectTaskService.java new file mode 100644 index 00000000..a51efab3 --- /dev/null +++ b/src/main/java/com/emr/service/AfCollectTaskService.java @@ -0,0 +1,13 @@ +package com.emr.service; + +/** + * @InterfaceName AfCollectTaskService + * @Description + * @Author linjj + * @Date 2023/5/4 16:33 + * @Version 1.0 + */ +public interface AfCollectTaskService { + + String getTaskId(int flagNum, String id); +} diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 719e9df2..4f07a8bd 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -6,11 +6,9 @@ */ package com.emr.service; -import com.emr.entity.Archive_Master; -import com.emr.entity.Archive_Master_Vo; -import com.emr.entity.Emr_Fault_Detail; -import com.emr.entity.OffsetLimitPage; +import com.emr.entity.*; import com.emr.vo.GetTime; +import org.apache.ibatis.annotations.Param; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -22,6 +20,12 @@ public interface Archive_MasterService { * @return */ Archive_Master selectById(String id); + + + + List selectCommonlyUsed(String id); + + int insertCommonlyUsed(CommomVo commomVo); /** * 根据字段查询记录 * @param archiveMaster @@ -34,6 +38,13 @@ public interface Archive_MasterService { * @return */ OffsetLimitPage selectByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit); + /** + * @description: 添加commomtable表记录 + * @params: commomVo + * @return: int + * @author linjj + * @date: 2023/5/30 16:08 + */ /** * 根据条件查找在院病案列表 @@ -119,6 +130,8 @@ public interface Archive_MasterService { */ int updateByClo(Archive_Master record); + //根据id删除commomtable表已归档数据 + int deleteRecordByInp(@Param("masterId")String masterId); /** * 根据条件查询记录 diff --git a/src/main/java/com/emr/service/ipml/AfCollectTaskServiceImpl.java b/src/main/java/com/emr/service/ipml/AfCollectTaskServiceImpl.java new file mode 100644 index 00000000..08b3d549 --- /dev/null +++ b/src/main/java/com/emr/service/ipml/AfCollectTaskServiceImpl.java @@ -0,0 +1,24 @@ +package com.emr.service.ipml; + +import com.emr.dao.AfCollectTaskMapper; +import com.emr.service.AfCollectTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @ClassName AfCollectTaskServiceImpl + * @Description + * @Author linjj + * @Date 2023/5/4 16:33 + * @Version 1.0 + */ +@Service +public class AfCollectTaskServiceImpl implements AfCollectTaskService { + + @Autowired + AfCollectTaskMapper afCollectTaskMapper; + @Override + public String getTaskId(int flagNum, String pid) { + return afCollectTaskMapper.getTaskId(flagNum,pid); + } +} diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java index 4302e99e..e1037c42 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -15,6 +15,7 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.util.CollectionUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,9 +53,9 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { public OffsetLimitPage selectChild(Archive_Detail_Vo record, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveDetailMapper.selectChild(record); - for(Archive_Detail_Vo returnList:list){ + for (Archive_Detail_Vo returnList : list) { //改变新生儿数据的title，新格式为title+inpNo - returnList=changeTitle(returnList); + returnList = changeTitle(returnList); } return new OffsetLimitPage((Page) list); } @@ -69,21 +70,34 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { public OffsetLimitPage detailByClo(Archive_Detail_Vo record, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); //如果是进入新打开的页面，就把新生儿数据加上 - if((record.getAssortId()==null||"".equals(record.getAssortId()))&&(!"".equals(record.getPatientId())&&record.getPatientId()!=null)){ - List list1= archiveDetailMapper.detailWithChildByClo(record); - for(Archive_Detail_Vo returnList:list1){ - if(!record.getPatientId().equals(returnList.getMasterid())){ + if ((record.getAssortId() == null || "".equals(record.getAssortId())) && (!"".equals(record.getPatientId()) && record.getPatientId() != null)) { + List list1 = archiveDetailMapper.detailWithChildByClo(record); + for (Archive_Detail_Vo returnList : list1) { + if (!record.getPatientId().equals(returnList.getMasterid())) { //改变新生儿数据的title，新格式为title+inpNo - returnList=changeTitle(returnList); + returnList = changeTitle(returnList); } } return new OffsetLimitPage((Page) list1); - }else{ + } else { List list = archiveDetailMapper.detailByClo(record); + List archiveDetailVos = archiveDetailMapper.detailByCloTop(record); + if (archiveDetailVos.size()>0){ + Archive_Detail_Vo archiveDetailVo = archiveDetailVos.get(0); + for (Archive_Detail_Vo listTop : list) { + listTop.setCreateTime(archiveDetailVo.getCreateTime()); + listTop.setCmtDoctorDate(archiveDetailVo.getCmtDoctorDate()); + listTop.setCmtNurseDate(archiveDetailVo.getCmtNurseDate()); + listTop.setArchivestate(archiveDetailVo.getArchivestate()); + } + } return new OffsetLimitPage((Page) list); - } + } + + } + @Override public List sourceByClo(Archive_Detail_Vo record) { return archiveDetailMapper.sourceByClo(record); @@ -141,7 +155,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { @Override public List selectTypeTreeByPatientIdAndAssortIds(String patientId, String assortIds) { - return archiveDetailMapper.selectTypeTreeByPatientIdAndAssortIds(patientId,assortIds); + return archiveDetailMapper.selectTypeTreeByPatientIdAndAssortIds(patientId, assortIds); } @Override @@ -149,18 +163,19 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { List arList = archiveDetailMapper.selectByIdStr1(detail); List pdfList = mulFile2OneById(response, arList); //存至session - session.setAttribute("showRecord",pdfList); + session.setAttribute("showRecord", pdfList); } /** * 封装合成pdf方法 + * * @param response * @param arList */ @Override - public List mulFile2OneById(HttpServletResponse response,List arList) { + public List mulFile2OneById(HttpServletResponse response, List arList) { response.setCharacterEncoding("utf-8"); - List pdfList = new ArrayList<>(); + List pdfList = new ArrayList<>(); if (arList != null && !arList.isEmpty()) { //TODO 抽取首次病程记录 String strTemp = "首次病程"; @@ -168,15 +183,15 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { //定义护理记录里的首次护理记录排前头 String nurseTemp = "首次护理"; String nurseAssortId = "C70E8C427A3648B79BE80798C08F4D12"; - if(!CollectionUtils.isEmpty(arList)) { + if (!CollectionUtils.isEmpty(arList)) { String strPath = ""; String nursePath = ""; for (int i = 0; i < arList.size(); i++) { String assortid = arList.get(i).getAssortid(); - if(StringUtils.isNotBlank(assortid) && assortid.equals(assortId) && arList.get(i).getTitle().contains(strTemp)){ + if (StringUtils.isNotBlank(assortid) && assortid.equals(assortId) && arList.get(i).getTitle().contains(strTemp)) { strPath = arList.get(i).getPdfPath(); } - if(StringUtils.isNotBlank(assortid) && assortid.equals(nurseAssortId) && arList.get(i).getTitle().contains(nurseTemp)){ + if (StringUtils.isNotBlank(assortid) && assortid.equals(nurseAssortId) && arList.get(i).getTitle().contains(nurseTemp)) { nursePath = arList.get(i).getPdfPath(); } } @@ -196,7 +211,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { pdfList.add(nursePath); nurseFlag = true; } - if(!detail.getPdfPath().equals(strPath) && !detail.getPdfPath().equals(nursePath)){ + if (!detail.getPdfPath().equals(strPath) && !detail.getPdfPath().equals(nursePath)) { pdfList.add(str); } } @@ -208,8 +223,8 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { @Override public void showPdf(HttpServletResponse response, HttpSession session, String pdfWater) { - List pdfList = (List)session.getAttribute("showRecord"); - if(!CollectionUtils.isEmpty(pdfList)) { + List pdfList = (List) session.getAttribute("showRecord"); + if (!CollectionUtils.isEmpty(pdfList)) { Jpg2PdfUtil jpg2PdfUtil = Jpg2PdfUtil.getInstance(); jpg2PdfUtil.mulFile2One(response, pdfList, pdfWater); } @@ -217,27 +232,27 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { session.removeAttribute("showRecord"); } - public List getList(List record){ - List list =new ArrayList(); - for (Archive_Detail_Vo newrecord:record){ + public List getList(List record) { + List list = new ArrayList(); + for (Archive_Detail_Vo newrecord : record) { List returnList = archiveDetailMapper.detailByClo(newrecord); - for (Archive_Detail_Vo newReturnList:returnList){ + for (Archive_Detail_Vo newReturnList : returnList) { list.add(newReturnList); } } return list; } - public Archive_Detail_Vo changeTitle(Archive_Detail_Vo newList){ - //改变title，变成title+inpNo - Archive_Master master= archiveMasterMapper.selectById(newList.getMasterid()); - if (master!= null) { - String inpNo = master.getInpNo(); - if (inpNo != null && !"".equals(inpNo)) { - //newList.setTitle(newList.getTitle() +"_"+ inpNo); - newList.setInpNo(inpNo); - } - } + public Archive_Detail_Vo changeTitle(Archive_Detail_Vo newList) { + //改变title，变成title+inpNo + Archive_Master master = archiveMasterMapper.selectById(newList.getMasterid()); + if (master != null) { + String inpNo = master.getInpNo(); + if (inpNo != null && !"".equals(inpNo)) { + //newList.setTitle(newList.getTitle() +"_"+ inpNo); + newList.setInpNo(inpNo); + } + } return newList; } 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 faa93198..a9ca8daf 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -32,7 +32,6 @@ import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.OffsetDateTime; import java.util.*; @Slf4j @@ -76,6 +75,16 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return archiveMasterMapper.selectById(id); } + @Override + public List selectCommonlyUsed(String id) { + return archiveMasterMapper.selectCommonlyUsed(id); + } + + @Override + public int insertCommonlyUsed(CommomVo commomVo) { + return archiveMasterMapper.insertCommonlyUsed(commomVo); + } + @Override public List selByCol(Archive_Master archiveMaster) { return archiveMasterMapper.selByCol(archiveMaster); @@ -448,6 +457,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return archiveMasterMapper.updateByClo(record); } + @Override + public int deleteRecordByInp(String masterId) { + return archiveMasterMapper.deleteRecordByInp(masterId); + } + @Override public int updateByClo2(Archive_Master record) { diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties index 31d451d8..5f3fdc62 100644 --- a/src/main/resources/log4j.properties +++ b/src/main/resources/log4j.properties @@ -3,7 +3,7 @@ log4j.appender.myLog=org.apache.log4j.DailyRollingFileAppender log4j.appender.myLog.File=D:\\logs\\emr_medical_record\\info\\info_log log4j.appender.myLog.DatePattern=-yyyy-MM-dd'.log' log4j.appender.myLog.Append = true -log4j.appender.myLog.Threshold = info +log4j.appender.myLog.Threshold = debug log4j.appender.myLog.layout=org.apache.log4j.PatternLayout log4j.appender.myLog.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n @@ -12,7 +12,7 @@ log4j.appender.errorMsg=org.apache.log4j.DailyRollingFileAppender log4j.appender.errorMsg.File=D:\\logs\\emr_medical_record\\error\\error_log log4j.appender.errorMsg.DatePattern=-yyyy-MM-dd'.log' log4j.appender.errorMsg.Append = true -log4j.appender.errorMsg.Threshold = error +log4j.appender.errorMsg.Threshold = debug log4j.appender.errorMsg.layout=org.apache.log4j.PatternLayout log4j.appender.errorMsg.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n @@ -23,5 +23,5 @@ log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern =%d %-5p [%c{5}] - %m%n log4j.logger.com.emr=debug -log4j.logger.com.alibaba=error -log4j.logger.org=error +log4j.logger.com.alibaba=debug +log4j.logger.org=debug diff --git a/src/main/resources/mapper/AfCollectTaskMapper.xml b/src/main/resources/mapper/AfCollectTaskMapper.xml new file mode 100644 index 00000000..843a8528 --- /dev/null +++ b/src/main/resources/mapper/AfCollectTaskMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index d1b2cdaf..cf56ae48 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -161,21 +161,10 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index ee1b6ae4..3bc10f5c 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -113,6 +113,8 @@ + + id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState, @@ -175,7 +177,7 @@ ,ISNULL(printTable.num, 0) printNum from archive_master m LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where - typeCode='dept_code' )) d + typeCode='dept_code' ))d on m.dept_admission_to=d.code LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) f @@ -247,8 +249,6 @@ and m.admission_date_time <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' - - and m.check_doctor = #{checkDoctor,jdbcType=NVARCHAR} @@ -415,12 +415,164 @@ ORDER BY discharge_date_time desc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 3026061d..216f7463 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -488,7 +488,7 @@ and f.update_time = #{updateTime,jdbcType=NCHAR} - and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + and m.inp_no = #{inpNo,jdbcType=NCHAR} and m.visit_id=#{visitId,jdbcType=NCHAR} diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index ceaf1c6e..cdaacc5d 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -795,7 +795,7 @@ <%-- --%> - <%----%> + <%----%>