From ea100743628261a70746ffc2f76913f7d3d0fceb Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Thu, 7 Dec 2023 15:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=8C=BB=E7=94=9F=E3=80=81=E6=8A=A4=E5=A3=AB=E4=BC=98?= =?UTF-8?q?=E5=85=88=E6=98=BE=E7=A4=BA=E7=94=B5=E5=AD=90=E7=97=85=E5=8E=86?= =?UTF-8?q?=E3=80=81=E6=8A=A4=E7=90=86=E6=96=87=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emr/controller/lastVerifyController.java | 54 +++- .../com/emr/dao/Archive_MasterMapper.java | 6 + .../com/emr/entity/Archive_Master_Vo.java | 2 + .../emr/service/Archive_MasterService.java | 4 +- .../ipml/Archive_MasterServiceImpl.java | 50 +-- src/main/resources/config/config.properties | 2 +- .../resources/mapper/Archive_MasterMapper.xml | 96 +++++- .../views/beHospitaledDir/beHospList.jsp | 26 +- .../webapp/static/js/beHospList/beHospList.js | 20 +- .../js/lastVerifyList/lastVerifyList.js | 292 ++++++++++-------- 10 files changed, 331 insertions(+), 221 deletions(-) diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index 514ef41..e18af78 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; + @Controller @RequestMapping("lastVerify") public class lastVerifyController { @@ -49,30 +50,30 @@ public class lastVerifyController { private EmrOvertimeSetService emrOvertimeSetService; @RequestMapping(value = "/lastVerifys") - public String faults(Integer flag, Model model,String startDateTo,String endDateTo){ - if(null != flag){ - model.addAttribute("flag",flag); - model.addAttribute("overDateSet",overDateSet); + public String faults(Integer flag, Model model, String startDateTo, String endDateTo) { + if (null != flag) { + model.addAttribute("flag", flag); + model.addAttribute("overDateSet", overDateSet); //获取超期提醒日期 String remindDate = emrOvertimeSetService.getRemindDate(); - if(StringUtils.isNotBlank(remindDate)){ - model.addAttribute("remindDate",remindDate); + if (StringUtils.isNotBlank(remindDate)) { + model.addAttribute("remindDate", remindDate); } } - model.addAttribute("startDate",startDateTo); - model.addAttribute("endDate",endDateTo); + model.addAttribute("startDate", startDateTo); + model.addAttribute("endDate", endDateTo); return "lastVerifyDir/lastVerifyList"; } /** * 终审列表 - * */ + */ @ResponseBody @RequestMapping(value = "/lastVerifyList") - public OffsetLimitPage lastVerifyList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch) { + public OffsetLimitPage lastVerifyList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit, Integer isSearch) { //判断是否是初始化查询，是初始化查询把开始结束时间置空 - if(isSearch == 0){ + if (isSearch == 0) { archiveMasterVo.setStartDateTo(null); archiveMasterVo.setEndDateTo(null); } @@ -89,9 +90,9 @@ public class lastVerifyController { @ResponseBody @RequestMapping(value = "/exportExcel") - public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo,Integer isSearch){ + public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo, Integer isSearch) { //判断是否是初始化查询，是初始化查询把开始结束时间置空 - if(isSearch == 0){ + if (isSearch == 0) { archiveMasterVo.setStartDateTo(null); archiveMasterVo.setEndDateTo(null); } @@ -126,6 +127,24 @@ public class lastVerifyController { } } + /** + * @description: 纸质签收、取消签收 + * @author linjj + * @date: 2023/12/6 17:13 + */ + @ResponseBody + @RequestMapping(value = "/addPaperStatic") + public int addPaperStatic(String id, int paperStatic) { + int i = 0; + if (paperStatic == 0) { + i = archiveMasterService.addPaperStatic(id, 1); + } + if (paperStatic == 1) { + i = archiveMasterService.addPaperStatic(id, 0); + } + return i; + } + @ResponseBody @RequestMapping(value = "/getDetailByArchId") @@ -141,6 +160,7 @@ public class lastVerifyController { /** * 退回提交方法 + * * @param request * @param emrFaultDetail * @return @@ -148,7 +168,7 @@ public class lastVerifyController { */ @ResponseBody @RequestMapping(value = "/updateDetailByArchivId") - public Msg updateDetailByArchivId(HttpServletRequest request,Emr_Fault_Detail_Vo emrFaultDetail) throws Exception{ + public Msg updateDetailByArchivId(HttpServletRequest request, Emr_Fault_Detail_Vo emrFaultDetail) throws Exception { boolean flag = FormTokenFlagUtil.isFlag(request); if (!flag) { return Msg.fail("请不要重复提交!"); @@ -160,7 +180,7 @@ public class lastVerifyController { //终审 @ResponseBody @RequestMapping(value = "/updateStateByArchivId") - public Msg updateStateByArchivId(HttpServletRequest request,Archive_Master_Vo master) throws Exception{ + public Msg updateStateByArchivId(HttpServletRequest request, Archive_Master_Vo master) throws Exception { boolean flag = FormTokenFlagUtil.isFlag(request); if (!flag) { return Msg.fail("请不要重复提交!"); @@ -172,9 +192,9 @@ public class lastVerifyController { @ResponseBody @RequestMapping(value = "/selectIsScan") - public Msg selectIsScan(String ids) throws Exception{ + public Msg selectIsScan(String ids) throws Exception { ids = archiveDetailService.selectIsScan(ids); - return Msg.success().add("ids",ids); + return Msg.success().add("ids", ids); } } diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index 50049e0..2233973 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -31,6 +31,12 @@ public interface Archive_MasterMapper { int updateByClo(Archive_Master record); + int addPaperStatic(@Param("id") String id,@Param("paperStatic") int paperStatic); + + + int updateByClo1(Archive_Master record); + + int updateById(Archive_Master record); List getDoctorFileInfo(@Param("deptCode")String deptCode,@Param("doctor")String doctor,@Param("startTime")String startTime,@Param("endTime")String endTime); 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 bc60598..0dcc450 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -32,6 +32,8 @@ public class Archive_Master_Vo extends Archive_Master{ private String SubAssort; + private int paperStatic; + private String btns;//拼接按钮 private String status;//转换中文状态 diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 0abf529..05106e0 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -83,7 +83,7 @@ public interface Archive_MasterService { OffsetLimitPage selectByLast(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit); - + int addPaperStatic(String id,int paperStatic); /** * 根据条件查询记录 * @param record @@ -91,6 +91,8 @@ public interface Archive_MasterService { */ int updateByClo(Archive_Master record); + int updateByClo1(Archive_Master record); + /** * 根据id修改记录 * @param record 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 f52ca40..c25f24d 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -88,7 +88,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { archiveMasterVo.setUserName(user.getUserName()); } - //查询 List list = selectByColumn(offset, limit,archiveMasterVo,request); return new OffsetLimitPage((Page) list); @@ -263,6 +262,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return new OffsetLimitPage((Page) list); } + @Override + public int addPaperStatic(String id, int paperStatic) { + return archiveMasterMapper.addPaperStatic(id,paperStatic); + } + /** * 查询终审页面列表 * */ @@ -323,40 +327,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { PageHelper.offsetPage(offset, limit); } list = archiveMasterMapper.selectByColumn(archiveMasterVo); - - //组织完整性字段并完整的更新archive_master表的完整性字段值为完整LockInfo='完整' - //updateMasterBySuccess(list); - //转换科室与赋值超期天数 - // selectByColumnChange(list); - //根据状态code转换状态及判断显示按钮 - /*if(null != list && !list.isEmpty()){ - //查询流转角色集合 - List flowRoles = flowRoleMapper.selectAll(); - //计算属于哪种审核角色 - Msg role = getRole(); - if(null != role) { - for (Archive_Master_Vo masterVo : list) { - String archivestate = masterVo.getArchivestate(); - if (StringUtils.isNotBlank(archivestate)) { - //转换中文状态 - boolean numeric = isNumeric(archivestate); - if (numeric) { - Integer status = Integer.valueOf(archivestate); - //组织已经审核的状态 - archivestate = EnumVerify.DocState.GetStepName(status, role.getCode()); - //组织未审核的状态 - String currentArchivestate = EnumVerify.DocState.GetCurrentStepName(status, role.getCode()); - masterVo.setStatus(archivestate); - masterVo.setCurrentStatus(currentArchivestate); - //根据角色 - //获取审核按钮和退回按钮集合 - String btns = getBtns(status, flowRoles, masterVo.getId()); - masterVo.setBtns(btns); - } - } - } - } - }*/ Emr_Dictionary dictionary = new Emr_Dictionary(); dictionary.setTypecode("dept_code"); List dictionaries = dictionaryMapper.dicByTypeCode(dictionary); @@ -774,6 +744,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return archiveMasterMapper.updateByClo(record); } + + @Override + public int updateByClo1(Archive_Master record) { + return archiveMasterMapper.updateByClo1(record); + } + + + @Override public int updateById(Archive_Master record) { return archiveMasterMapper.updateById(record); @@ -1289,7 +1267,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //设为已归档状态 archiveMaster.setArchivestate(EnumVerify.DocState.MedicalRoomCheck.getCode() + ""); //更新 - updateByClo(archiveMaster); + updateByClo1(archiveMaster); //当前节点两种可能病案室审核和已召回 //是已召回，将当前节点code置为病案室审核 String currentStatus = EnumVerify.DocState.MedicalRoomCheck.getCode() + ""; diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index dc35719..231114a 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -3,7 +3,7 @@ #POWER_PORT = 8081 POWER_IP = localhost -POWER_PORT = 8083 +POWER_PORT = 8081 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 POWER_URLHEAD = http://${POWER_IP}:${POWER_PORT}/power diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 80aa3d1..e762429 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -48,6 +48,7 @@ + @@ -641,7 +642,7 @@ - (SELECT DISTINCT patient_id FROM archive_printInfo WHERE print_userid not in (1,2399) and D1 > 0) + (SELECT DISTINCT patient_id FROM archive_printInfo WHERE print_userid not in ('1','2399') and D1 > 0) - select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex, + select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,m.paper_static, dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,dept_admission_to ,m.check_doctor,m.check_datetime,m.checked_doctor,m.checked_datetime,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend, datediff(day,m.discharge_date_time,getdate()) - @@ -1376,6 +1365,9 @@ + + update archive_master set paper_static=#{paperStatic} where id=#{id} + update archive_master @@ -1518,6 +1510,78 @@ UPDATE archive_master SET LockInfo = #{lockinfo} WHERE id IN (${masterIds}) + + update archive_master + + + inp_no = #{inpNo,jdbcType=NVARCHAR}, + + + visit_id = #{visitId,jdbcType=NVARCHAR}, + + + name = #{name,jdbcType=NVARCHAR}, + + + sex = #{sex,jdbcType=NVARCHAR}, + + + dept_name = #{deptName,jdbcType=NVARCHAR}, + + + discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}, + + + ArchiveState = #{archivestate,jdbcType=NVARCHAR}, + + + admission_date_time = #{admissionDateTime,jdbcType=NVARCHAR}, + + + dept_admission_to = #{deptAdmissionTo,jdbcType=NVARCHAR}, + + + check_doctor = #{checkDoctor,jdbcType=NVARCHAR}, + + + check_datetime = #{checkDatetime,jdbcType=NVARCHAR}, + + + checked_doctor = #{checkedDoctor,jdbcType=NVARCHAR}, + + + checked_datetime = #{checkedDatetime,jdbcType=NVARCHAR}, + + + LockInfo = #{lockinfo,jdbcType=NVARCHAR}, + + + DOCTOR_IN_CHARGE = #{doctorInCharge,jdbcType=NVARCHAR}, + + + ID_NO = #{idNo,jdbcType=NVARCHAR}, + + + DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR}, + + + dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR}, + + + returnto_role = #{returntoRole,jdbcType=NVARCHAR}, + + + return_oper_username = #{returnOperUsername,jdbcType=NVARCHAR}, + + + change_reason = #{changeReason,jdbcType=NVARCHAR}, + + + change_reason = #{changeReason,jdbcType=NVARCHAR}, + + + where id = #{id,jdbcType=NVARCHAR} + -
- - -
+<%--
--%> +<%-- --%> +<%-- --%> +<%--
--%>
' - +'
' - +'修改原因：
'; + + '' + + '
' + + '修改原因：
'; $("#block").append(html); - }else{ + } else { $("#block").empty(); } } + //获取当前时间 -function getFormatDate(){ +function getFormatDate() { var nowDate = new Date(); var year = nowDate.getFullYear(); var month = nowDate.getMonth() + 1 < 10 ? "0" + (nowDate.getMonth() + 1) : nowDate.getMonth() + 1; var date = nowDate.getDate() < 10 ? "0" + nowDate.getDate() : nowDate.getDate(); - var hour = nowDate.getHours()< 10 ? "0" + nowDate.getHours() : nowDate.getHours(); - var minute = nowDate.getMinutes()< 10 ? "0" + nowDate.getMinutes() : nowDate.getMinutes(); - var second = nowDate.getSeconds()< 10 ? "0" + nowDate.getSeconds() : nowDate.getSeconds(); - return year + "-" + month + "-" + date+" "+hour+":"+minute+":"+second; + var hour = nowDate.getHours() < 10 ? "0" + nowDate.getHours() : nowDate.getHours(); + var minute = nowDate.getMinutes() < 10 ? "0" + nowDate.getMinutes() : nowDate.getMinutes(); + var second = nowDate.getSeconds() < 10 ? "0" + nowDate.getSeconds() : nowDate.getSeconds(); + return year + "-" + month + "-" + date + " " + hour + ":" + minute + ":" + second; } //导出excel功能 @@ -729,55 +763,58 @@ $("#excelBtn").click(function () { } var startDateTo = $("#startDateTo").val(); var endDateTo = $("#endDateTo").val(); - window.location.href = path+"/lastVerify/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + - "&name=" + name + "&deptName=" + deptName - + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&isSearch="+$("#isSearch").val()+"&doctorInCharge="+$("#doctorInCharge").val()+"&isSign="+$("#isSign").val()+"&checkName="+$("#checkName").val(); + window.location.href = path + "/lastVerify/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + + "&name=" + name + "&deptName=" + deptName + + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo + "&isSearch=" + $("#isSearch").val() + "&doctorInCharge=" + $("#doctorInCharge").val() + "&isSign=" + $("#isSign").val() + "&checkName=" + $("#checkName").val(); }); + //纸质位置切换自定义输入 -function paperSelect(){ +function paperSelect() { $("#block1").empty(); var str = '\n' + ' '; $("#block1").append(str); $("#paperPostionValue").val(2); }; + //纸质位置切换选择输入 -function paperSelect1(){ +function paperSelect1() { loadSelectPaperPostion(); }; + //查询纸质位置字典 -function selectPaperPositonDictionary(){ +function selectPaperPositonDictionary() { var selectValue = ''; $.ajax({ - type:'get', - url:path+'/paperPostion/selectPaperPositonDictionary', - dateType:'json', - async:false, - success:function(data){ - if(null != data) { + type: 'get', + url: path + '/paperPostion/selectPaperPositonDictionary', + dateType: 'json', + async: false, + success: function (data) { + if (null != data) { for (var i = 0; i < data.length; i++) { //获取输入框类型 //1选择框 2输入框 var inputType = data[i].int1; //组织id - var id = 'paperPosition'+(i+1); + var id = 'paperPosition' + (i + 1); //获取是否必填 1是0否 var isRequire = data[i].int2; - var labelId = id + '_' + (i+1); - if(inputType == 1){ + var labelId = id + '_' + (i + 1); + if (inputType == 1) { //选择框 - selectValue += ''; //取出选择值集合 var typeValues = data[i].typevalue.split(","); - for(var j = 0;j < typeValues.length;j++){ - selectValue += ''; + for (var j = 0; j < typeValues.length; j++) { + selectValue += ''; } selectValue += ''; - selectValue += ''; - }else if(inputType == 2){ + selectValue += ''; + } else if (inputType == 2) { //输入框 - selectValue += ''; - selectValue += ''; + selectValue += ''; + selectValue += ''; } } $("#paperPostionValueLength").val(data.length); @@ -788,13 +825,14 @@ function selectPaperPositonDictionary(){ } //返回纸质选择输入html字符串 -function selectSelectPaperPostion(){ +function selectSelectPaperPostion() { var paperPositionSelect = selectPaperPositonDictionary(); paperPositionSelect += ''; return paperPositionSelect; } + //加载纸质选择输入 -function loadSelectPaperPostion(){ +function loadSelectPaperPostion() { $("#block1").empty(); var str = selectSelectPaperPostion(); $("#block1").append(str);