diff --git a/src/main/java/com/emr/controller/TempHandleWzController.java b/src/main/java/com/emr/controller/TempHandleWzController.java new file mode 100644 index 0000000..fe9716d --- /dev/null +++ b/src/main/java/com/emr/controller/TempHandleWzController.java @@ -0,0 +1,73 @@ +package com.emr.controller; + +import com.emr.entity.Archive_Master; +import com.emr.entity.Archive_Master_Vo; +import com.emr.entity.TempMasterID; +import com.emr.service.Archive_MasterService; +import com.emr.service.TempMasterIDService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.List; + +@Controller +public class TempHandleWzController { + @Autowired + private TempMasterIDService tempMasterIDService; + @Autowired + private Archive_MasterService archiveMasterService; + + @RequestMapping("toReloadWzPage") + public String toReloadWzPage() { + return "reloadWz"; + } + + @RequestMapping("selectByInpNoAndVisitId") + @ResponseBody + public List selectByInpNoAndVisitId(Archive_Master_Vo archive_master_vo){ + return this.archiveMasterService.selectByUnfile(archive_master_vo); + } + + @RequestMapping("reloadWz") + @ResponseBody + public int reloadWz(String masterId){ + int rows = 0; + TempMasterID tempMasterID = new TempMasterID(); + tempMasterID.setId(masterId); + List list = new ArrayList<>(); + list.add(tempMasterID); + rows = tempMasterIDService.reloadWz(list); + return rows; + } + + @RequestMapping("reloadWzAll") + @ResponseBody + public int reloadWzAll(){ + int rows = 0; + //List list = tempMasterIDService.selectAllMasterID(); + //rows = tempMasterIDService.reloadWz(list); + + TempMasterID t1 = new TempMasterID(); + t1.setId("36cc3c27-447e-48e4-93b9-06b3acc397ca"); + TempMasterID t2 = new TempMasterID(); + t2.setId("a490ca0b-879f-4ae4-9238-33c44e5fda99"); + TempMasterID t3 = new TempMasterID(); + t3.setId("0687f5a2-40f0-48ce-872b-922d8ceba7da"); + TempMasterID t4 = new TempMasterID(); + t4.setId("169044f8-21a2-4420-ad01-c24b19910e3a"); + TempMasterID t5 = new TempMasterID(); + t5.setId("3f3d18cf-6f75-4367-9ada-3684e176c102"); + List list = new ArrayList<>(); + list.add(t1); + list.add(t2); + list.add(t3); + list.add(t4); + list.add(t5); + rows = tempMasterIDService.reloadWz(list); + return rows; + } +} diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java index 714c41f..8f9cad2 100644 --- a/src/main/java/com/emr/controller/faultController.java +++ b/src/main/java/com/emr/controller/faultController.java @@ -362,7 +362,12 @@ public class faultController { return emrFaultDetail; } - + @ResponseBody + @RequestMapping(value = "/getQualityControlList") + public OffsetLimitPage getQualityControlList(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { + OffsetLimitPage result = emrFaultDetailService.getQualityControlList(emrFaultVo, offset, limit); + return result; + } } diff --git a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java index 5fbada3..c90d66e 100644 --- a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java +++ b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java @@ -36,4 +36,6 @@ public interface Emr_Fault_DetailMapper { List selectByArchiveId(Emr_Fault_Detail emrFaultDetail); List selectStorageByCol(Emr_Fault_Vo emrFaultVo); + + List getQualityControlList(Emr_Fault_Vo emrFaultVo);//获取质控缺陷评分列表 } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/TempMasterIDMapper.java b/src/main/java/com/emr/dao/TempMasterIDMapper.java new file mode 100644 index 0000000..9d7dd3b --- /dev/null +++ b/src/main/java/com/emr/dao/TempMasterIDMapper.java @@ -0,0 +1,13 @@ +package com.emr.dao; + +import com.emr.entity.TempMasterID; +import com.emr.entity.TempMasterIDExample; +import java.util.List; + +public interface TempMasterIDMapper { + int insert(TempMasterID record); + + int insertSelective(TempMasterID record); + + List selectByExample(TempMasterIDExample example); +} \ No newline at end of file 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 4e0f7f2..05456aa 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -119,6 +119,16 @@ public class Archive_Master_Vo { private String createTimeEnd; + private String overdueDays; + + public String getOverdueDays() { + return overdueDays; + } + + public void setOverdueDays(String overdueDays) { + this.overdueDays = overdueDays; + } + public String getCreateTimeStart() { return createTimeStart; } diff --git a/src/main/java/com/emr/entity/Emr_Fault_Vo.java b/src/main/java/com/emr/entity/Emr_Fault_Vo.java index 8ca98dd..55a1f9d 100644 --- a/src/main/java/com/emr/entity/Emr_Fault_Vo.java +++ b/src/main/java/com/emr/entity/Emr_Fault_Vo.java @@ -86,6 +86,26 @@ public class Emr_Fault_Vo { private String archiveState; + private String typeName; + + private String doctorInCharge; + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public String getDoctorInCharge() { + return doctorInCharge; + } + + public void setDoctorInCharge(String doctorInCharge) { + this.doctorInCharge = doctorInCharge; + } + public Integer getId() { return id; } diff --git a/src/main/java/com/emr/entity/TempMasterID.java b/src/main/java/com/emr/entity/TempMasterID.java new file mode 100644 index 0000000..1a16a5d --- /dev/null +++ b/src/main/java/com/emr/entity/TempMasterID.java @@ -0,0 +1,13 @@ +package com.emr.entity; + +public class TempMasterID { + private String id; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id == null ? null : id.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/emr/entity/TempMasterIDExample.java b/src/main/java/com/emr/entity/TempMasterIDExample.java new file mode 100644 index 0000000..97c9ea0 --- /dev/null +++ b/src/main/java/com/emr/entity/TempMasterIDExample.java @@ -0,0 +1,270 @@ +package com.emr.entity; + +import java.util.ArrayList; +import java.util.List; + +public class TempMasterIDExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TempMasterIDExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/emr/service/Emr_Fault_DetailService.java b/src/main/java/com/emr/service/Emr_Fault_DetailService.java index 14ba531..4f9a6cc 100644 --- a/src/main/java/com/emr/service/Emr_Fault_DetailService.java +++ b/src/main/java/com/emr/service/Emr_Fault_DetailService.java @@ -97,6 +97,10 @@ public interface Emr_Fault_DetailService { List selectByArchiveId(Emr_Fault_Detail emrFaultDetail); OffsetLimitPage selectStorageByCol(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); + + List getQualityControlList(Emr_Fault_Vo emrFaultVo);//获取质控缺陷评分列表 + + OffsetLimitPage getQualityControlList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); } diff --git a/src/main/java/com/emr/service/TempMasterIDService.java b/src/main/java/com/emr/service/TempMasterIDService.java new file mode 100644 index 0000000..6a9cda9 --- /dev/null +++ b/src/main/java/com/emr/service/TempMasterIDService.java @@ -0,0 +1,14 @@ +package com.emr.service; + +import com.emr.entity.Archive_Master; +import com.emr.entity.Archive_Master_Vo; +import com.emr.entity.TempMasterID; + +import java.util.List; + +public interface TempMasterIDService { + List selectAllMasterID(); + + //重新校验完整性并赋值 + int reloadWz(List masterIDList); +} 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 2ed85b3..03715de 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -24,9 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.google.common.collect.Maps; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; @Service public class Archive_MasterServiceImpl implements Archive_MasterService { @@ -49,7 +47,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public OffsetLimitPage selectByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list= archiveMasterMapper.selectByCol(archiveMasterVo); - List resultList = new Page<>(); + JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); if (powerUserList != null){ @@ -60,29 +58,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { }}); for (Archive_Master archive_master : list) { - String doctorName =""; - String nurseName =""; + JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); if (userInfo==null){ - doctorName=archive_master.getDoctorName(); + archive_master.setDoctorName(archive_master.getDoctorName()); }else { - doctorName = userInfo.getString("name"); + archive_master.setDoctorName(userInfo.getString("name")); } userInfo = mappedMovies.get(archive_master.getNurseName()); if (userInfo==null){ - nurseName=archive_master.getNurseName(); + archive_master.setNurseName(archive_master.getNurseName()); }else { - nurseName = userInfo.getString("name"); + archive_master.setNurseName(userInfo.getString("name")); } - - archive_master.setDoctorName(doctorName); - archive_master.setNurseName(nurseName); - resultList.add(archive_master); } } - return new OffsetLimitPage((Page) resultList); + return new OffsetLimitPage((Page) list); } @Override @@ -124,7 +117,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectByColumn(archiveMasterVo); - List resultList = new Page<>(); + JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); if (powerUserList != null){ @@ -135,36 +128,31 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { }}); for (Archive_Master archive_master : list) { - String doctorName =""; - String nurseName =""; + JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); if (userInfo==null){ - doctorName=archive_master.getDoctorName(); + archive_master.setDoctorName(archive_master.getDoctorName()); }else { - doctorName = userInfo.getString("name"); + archive_master.setDoctorName(userInfo.getString("name")); } userInfo = mappedMovies.get(archive_master.getNurseName()); if (userInfo==null){ - nurseName=archive_master.getNurseName(); + archive_master.setNurseName(archive_master.getNurseName()); }else { - nurseName = userInfo.getString("name"); + archive_master.setNurseName(userInfo.getString("name")); } - - archive_master.setDoctorName(doctorName); - archive_master.setNurseName(nurseName); - resultList.add(archive_master); } } - return new OffsetLimitPage((Page) resultList); + return new OffsetLimitPage((Page) list); } @Override public OffsetLimitPage selectByUnfile(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectByUnfile(archiveMasterVo); - List resultList = new Page<>(); + JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); if (powerUserList != null){ @@ -175,85 +163,70 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { }}); for (Archive_Master archive_master : list) { - String doctorName =""; - String nurseName =""; + JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); if (userInfo==null){ - doctorName=archive_master.getDoctorName(); + archive_master.setDoctorName(archive_master.getDoctorName()); }else { - doctorName = userInfo.getString("name"); + archive_master.setDoctorName(userInfo.getString("name")); } userInfo = mappedMovies.get(archive_master.getNurseName()); if (userInfo==null){ - nurseName=archive_master.getNurseName(); + archive_master.setNurseName(archive_master.getNurseName()); }else { - nurseName = userInfo.getString("name"); + archive_master.setNurseName(userInfo.getString("name")); } - - archive_master.setDoctorName(doctorName); - archive_master.setNurseName(nurseName); - resultList.add(archive_master); } } - return new OffsetLimitPage((Page) resultList); + return new OffsetLimitPage((Page) list); } @Override public OffsetLimitPage selectByLast(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectByLast(archiveMasterVo); - List resultList = new Page<>(); + JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); - if (powerUserList != null){ - Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { - @Override - public String apply(JSONObject temp) { - return temp.getString("userName"); - }}); + + if (powerUserList != null) { + Map mappedMovies = Maps.uniqueIndex(powerUserList, temp -> temp.getString("userName")); for (Archive_Master_Vo archive_master : list) { - String doctorName =""; - String nurseName =""; - String firstInstance =""; + JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); - if (userInfo==null){ - doctorName=archive_master.getDoctorName(); - }else { - doctorName = userInfo.getString("name"); + if (userInfo == null) { + archive_master.setDoctorName(archive_master.getDoctorName()); + } else { + archive_master.setDoctorName(userInfo.getString("name")); } userInfo = mappedMovies.get(archive_master.getNurseName()); - if (userInfo==null){ - nurseName=archive_master.getNurseName(); - }else { - nurseName = userInfo.getString("name"); + if (userInfo == null) { + archive_master.setNurseName(archive_master.getNurseName()); + } else { + archive_master.setNurseName(userInfo.getString("name")); } userInfo = mappedMovies.get(archive_master.getFirstInstance()); - if (userInfo==null){ - firstInstance=archive_master.getFirstInstance(); - }else { - firstInstance = userInfo.getString("name"); + if (userInfo == null) { + archive_master.setFirstInstance(archive_master.getFirstInstance()); + } else { + archive_master.setFirstInstance(userInfo.getString("name")); } - - archive_master.setDoctorName(doctorName); - archive_master.setNurseName(nurseName); - archive_master.setFirstInstance(firstInstance); - resultList.add(archive_master); } - } - return new OffsetLimitPage((Page) resultList); + + return new OffsetLimitPage((Page) list); } @Override public OffsetLimitPage selectByCmtCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectByCmtCol(archiveMasterVo); - List resultList = new Page<>(); + JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); if (powerUserList != null){ @@ -264,29 +237,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { }}); for (Archive_Master archive_master : list) { - String doctorName =""; - String nurseName =""; + JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); if (userInfo==null){ - doctorName=archive_master.getDoctorName(); + archive_master.setDoctorName(archive_master.getDoctorName()); }else { - doctorName = userInfo.getString("name"); + archive_master.setDoctorName(userInfo.getString("name")); } userInfo = mappedMovies.get(archive_master.getNurseName()); if (userInfo==null){ - nurseName=archive_master.getNurseName(); + archive_master.setNurseName(archive_master.getNurseName()); }else { - nurseName = userInfo.getString("name"); + archive_master.setNurseName(userInfo.getString("name")); } - - archive_master.setDoctorName(doctorName); - archive_master.setNurseName(nurseName); - resultList.add(archive_master); } } - return new OffsetLimitPage((Page) resultList); + return new OffsetLimitPage((Page) list); } @Override @@ -351,7 +319,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public OffsetLimitPage selectOverdue(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectOverdue(archiveMasterVo); - List resultList = new Page<>(); + JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); if (powerUserList != null){ @@ -362,29 +330,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { }}); for (Archive_Master_Vo archive_master : list) { - String doctorInChargeName =""; - String firstInstance =""; + JSONObject userInfo = mappedMovies.get(archive_master.getDoctorInCharge()); if (userInfo==null){ - doctorInChargeName=archive_master.getDoctorInCharge(); + archive_master.setDoctorInCharge(archive_master.getDoctorInCharge()); }else { - doctorInChargeName = userInfo.getString("name"); + archive_master.setDoctorInCharge(userInfo.getString("name")); } userInfo = mappedMovies.get(archive_master.getFirstInstance()); if (userInfo==null){ - firstInstance=archive_master.getFirstInstance(); + archive_master.setFirstInstance(archive_master.getFirstInstance()); }else { - firstInstance = userInfo.getString("name"); + archive_master.setFirstInstance(userInfo.getString("name")); } - - archive_master.setDoctorInCharge(doctorInChargeName); - archive_master.setFirstInstance(firstInstance); - resultList.add(archive_master); } } - return new OffsetLimitPage((Page) resultList); + return new OffsetLimitPage((Page) list); } @Override diff --git a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java index 04c51be..1763e22 100644 --- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java @@ -6,18 +6,24 @@ */ package com.emr.service.ipml; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.emr.dao.Emr_Fault_DetailMapper; import com.emr.entity.*; import com.emr.service.Emr_DictionaryService; import com.emr.service.Emr_Fault_DetailService; import com.emr.service.Emr_Fault_TypeService; +import com.emr.service.PowerUserService; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.google.common.base.Function; +import com.google.common.collect.Maps; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; +import java.util.Map; @Service public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { @@ -30,6 +36,9 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { @Autowired private Emr_DictionaryService emrDictionaryService; + + @Autowired + private PowerUserService powerUserService; /** * 根据条件查询缺陷列表 * @param emrFaultVo @@ -194,6 +203,46 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { return new OffsetLimitPage((Page) list); } + + @Override + public List getQualityControlList(Emr_Fault_Vo emrFaultVo) { + return emrFaultDetailMapper.getQualityControlList(emrFaultVo); + } + + @Override + public OffsetLimitPage getQualityControlList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List list = emrFaultDetailMapper.getQualityControlList(emrFaultVo); + + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null){ + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + }}); + + for (Emr_Fault_Vo emr_fault_vo : list) { + + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge()); + if (userInfo==null){ + emr_fault_vo.setDoctorInCharge(emr_fault_vo.getDoctorInCharge()); + }else { + emr_fault_vo.setDoctorInCharge(userInfo.getString("name")); + } + + userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo==null){ + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + }else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + } + + } + return new OffsetLimitPage((Page) list); + } } diff --git a/src/main/java/com/emr/service/ipml/TempMasterIDServiceImpl.java b/src/main/java/com/emr/service/ipml/TempMasterIDServiceImpl.java new file mode 100644 index 0000000..e40b308 --- /dev/null +++ b/src/main/java/com/emr/service/ipml/TempMasterIDServiceImpl.java @@ -0,0 +1,81 @@ +package com.emr.service.ipml; + +import com.emr.dao.Archive_MasterMapper; +import com.emr.dao.TempMasterIDMapper; +import com.emr.entity.Archive_Master; +import com.emr.entity.TempMasterID; +import com.emr.entity.TempMasterIDExample; +import com.emr.service.TempMasterIDService; +import org.apache.cxf.endpoint.Client; +import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class TempMasterIDServiceImpl implements TempMasterIDService { + @Autowired + private TempMasterIDMapper tempMasterIDMapper; + @Autowired + private Archive_MasterMapper archive_masterMapper; + @Value("${HomepageDictionary}") + private String HomepageDictionary; + @Value("${HomepageMethod}") + private String HomepageMethod; + + + @Override + public List selectAllMasterID() { + return tempMasterIDMapper.selectByExample(new TempMasterIDExample()); + } + + @Override + public int reloadWz(List masterIDList) { + String result = ""; + int rows = 0; + ArrayList archive_masters = new ArrayList<>(); + Archive_Master archive_master = null; + try { + String endpoint = HomepageDictionary; + String method = HomepageMethod; + JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance(); + Client client = factory.createClient(endpoint); +// HomepageDictionary_Service homepageDictionary_service = new HomepageDictionary_Service(); +// com.emr.webservice.HomepageDictionary homepageDictionaryImplPort = homepageDictionary_service.getHomepageDictionaryImplPort(); + + // 设置超时单位为毫秒 + /*HTTPConduit conduit = (HTTPConduit)client.getConduit(); + HTTPClientPolicy policy = new HTTPClientPolicy(); + policy.setConnectionTimeout(30000);//连接超时时间 + policy.setAllowChunking(false); + policy.setReceiveTimeout(180000);//请求超时时间. + conduit.setClient(policy);*/ + + for (TempMasterID tempMasterID:masterIDList) { + archive_master = new Archive_Master(); + String temp = tempMasterID.getId(); + Object[] res = null; + res = client.invoke(method, temp); + result = (String) res[0]; +// String result = homepageDictionaryImplPort.checkData(temp); + + //修改lockinfo + archive_master.setId(temp); + archive_master.setLockinfo(result); + archive_masters.add(archive_master); + //rows = archive_masterMapper.updateByClo(archive_master); + //TODO 手动提交事务 + + } + for (Archive_Master temp: archive_masters) { + rows = archive_masterMapper.updateByClo(temp); + } + } catch (Exception e) { + System.err.println(e.toString()); + } + return rows; + } +} diff --git a/src/main/java/com/emr/util/PrintToPdfUtil.java b/src/main/java/com/emr/util/PrintToPdfUtil.java index b49450e..37de3fa 100644 --- a/src/main/java/com/emr/util/PrintToPdfUtil.java +++ b/src/main/java/com/emr/util/PrintToPdfUtil.java @@ -34,6 +34,8 @@ import java.util.Map; * @author */ public class PrintToPdfUtil { + final private static float A4_weight = 595;//标准A4的宽 + final private static float A4_height = 842;//标准A4的高 /** * @param imageFolderPath 图片文件夹地址 @@ -96,7 +98,7 @@ public class PrintToPdfUtil { // 图片地址 String imagePath = null; // 读取图片流 - BufferedImage img = null; + //BufferedImage img = null; // 实例化图片 Image image = null; File[] files = file.listFiles(); @@ -107,7 +109,8 @@ public class PrintToPdfUtil { if (file1.getName().endsWith(".png") || file1.getName().endsWith(".jpg") || file1.getName().endsWith(".gif") || file1.getName().endsWith(".jpeg") || file1.getName().endsWith(".tif")) { - imageFolderPath = file1.getAbsolutePath(); + //2021-3-13修改 + /*imageFolderPath = file1.getAbsolutePath(); // 读取图片流 img = ImageIO.read(new File(imageFolderPath)); @@ -123,10 +126,36 @@ public class PrintToPdfUtil { // 根据图片大小设置文档大小 //doc.setPageSize(new Rectangle(img.getWidth(), img.getHeight())); // 实例化图片 - image = Image.getInstance(imageFolderPath); + image = Image.getInstance(imageFolderPath);*/ + + + Image img = Image.getInstance(imageFolderPath); + /*处理图片缩放比例*/ + float w = img.getWidth(); + float h = img.getHeight(); + float percent = 0; + if ((w > A4_weight) && (h < A4_height)) { + percent = (A4_weight * 100) / w; + } else if ((w < A4_weight) && (h > A4_height)) { + percent = (A4_height * 100) / h; + } else if ((w > A4_weight) && (h > A4_height)) { + percent = (A4_weight * 100) / w; + h = (h * percent) / 100; + if (h > A4_height) { + percent = (A4_height * 100) / h; + } + } + img.setAlignment(com.lowagie.text.Image.ALIGN_CENTER); + if(percent != 100){ + img.scaleAbsolute(A4_weight,A4_height); + }else{ + img.scalePercent(percent); + } + // 添加图片到文档 doc.open(); - doc.add(image); + doc.add(img); + //doc.add(image); } //file.getAbsolutePath().replaceFirst(path, " "); if (file1.isDirectory()) { diff --git a/src/main/java/com/emr/util/test.java b/src/main/java/com/emr/util/test.java index d689caf..d15e00c 100644 --- a/src/main/java/com/emr/util/test.java +++ b/src/main/java/com/emr/util/test.java @@ -88,7 +88,8 @@ public class test { String method = "CheckData"; JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance(); - Client client = factory.createClient("http://120.27.212.36:9999/filing/services/HomepageDictionary?wsdl"); + //Client client = factory.createClient("http://120.27.212.36:9999/filing/services/HomepageDictionary?wsdl"); + Client client = factory.createClient("http://127.0.0.1:8080/WholeCheckInterface/services/HomepageDictionary?wsdl"); // Endpoint endpoint2 = client.getEndpoint(); // QName opName = new QName(endpoint2.getService().getName().getNamespaceURI(), method); // BindingInfo bindingInfo = endpoint2.getEndpointInfo().getBinding(); @@ -101,7 +102,7 @@ public class test { // } // } Object[] res = null; - res = client.invoke("CheckData","02e4ba493dc643c9926926662327995e"); + res = client.invoke("CheckData","3f3d18cf-6f75-4367-9ada-3684e176c102"); String xml = (String) res[0]; System.err.println("@@@@@@@@@@@@@@@@@" + xml); } diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index e3056fe..a82e016 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1177,6 +1177,9 @@ and [dbo].[getWorkday](m.discharge_date_time,d.create_time)>7 + + and [dbo].[getWorkday](m.discharge_date_time,d.create_time)=#{overdueDays,jdbcType=NCHAR} + + \ No newline at end of file diff --git a/src/main/resources/mapper/TempMasterIDMapper.xml b/src/main/resources/mapper/TempMasterIDMapper.xml new file mode 100644 index 0000000..e632e1e --- /dev/null +++ b/src/main/resources/mapper/TempMasterIDMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id + + + + insert into TempMasterID (id) + values (#{id,jdbcType=VARCHAR}) + + + insert into TempMasterID + + + id, + + + + + #{id,jdbcType=VARCHAR}, + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index eedfc41..4f52ed3 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -948,13 +948,10 @@
- <%--归档病历已全部无纸化无扫描件--%> - 归档病历是否已全部无纸化无扫描件 - - 是 - 否 - - <%--归档病历已全部无纸化无扫描件--%> + 归档病历是否已全部无纸化无扫描件 + 是 + 否 +
@@ -996,12 +993,10 @@
- <%--归档病历已全部无纸化无扫描件--%> - 归档病历是否已全部无纸化无扫描件 - - 是 - 否 - + 归档病历是否已全部无纸化无扫描件 + 是 + 否 +
@@ -2133,10 +2128,8 @@ var lockinfo = $("#wzxText").val(); var content = $("#doctorText").val(); var isScanedChk = 0; - if ($('.isScanedChk').is(':checked')) { + if($('.isScanedChk1').is(':checked')){ isScanedChk = "1"; - } - if($('.isScanedChk').is(':checked')){ if (lockinfo == "完整") { $.ajax({ url: "${path}/beHosp/cmtDoctorOrNurs", @@ -2166,7 +2159,40 @@ show: true//弹出对话框 }); } - }}else { + } + }else if ($('.isScanedChk2').is(':checked')){ + if (lockinfo == "完整") { + $.ajax({ + url: "${path}/beHosp/cmtDoctorOrNurs", + type: "POST", + data: {cmtDoctor: doctorFlag, id: id,lockinfo:lockinfo,content:content,isscaned:isScanedChk}, + success: function (result) { + $("#doctorModal").modal('hide'); + if (result == "成功") { + $("#table").bootstrapTable("refresh"); + toastr.success("归档医生提交成功！"); + } else { + toastr.error("归档医生提交失败！"); + } + } + }); + } else { + //如果缺失病案首页或入院记录则无法强制提交 + if (lockinfo.indexOf("病案首页") != -1 || lockinfo.indexOf("入院记录") != -1) { + alert("缺失病案首页或入院记录，无法强制提交！"); + } else { + $("#flagStaff").val(0); + //弹窗提示是否强制性 + $("#WzRsult2").html(lockinfo); + $('#WZModal2').modal({ + backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 + keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 + show: true//弹出对话框 + }); + } + } + } + else { toastr.error("必填项未选择！归档医生提交失败！"); } }); @@ -2183,10 +2209,8 @@ var lockinfo = $("#wzx2Text").val(); var content = $("#nures2Text").val(); var isScanedChk2 = 0; - if ($('.isScanedChk2').is(':checked')) { + if($('.isScanedChk3').is(':checked')){ isScanedChk2 = "1"; - } - if($('.isScanedChk2').is(':checked')){ if (lockinfo == "完整") { $.ajax({ url: "${path}/beHosp/cmtDoctorOrNurs", @@ -2212,7 +2236,33 @@ show: true//弹出对话框 }); } - }else { + }else if ($('.isScanedChk4').is(':checked')){ + if (lockinfo == "完整") { + $.ajax({ + url: "${path}/beHosp/cmtDoctorOrNurs", + type: "POST", + data: {cmtNurse: nursFlag, id: id, lockinfo: lockinfo, content: content, isscaned: isScanedChk2}, + success: function (result) { + $("#nursModal").modal('hide'); + if (result == "成功") { + $("#table").bootstrapTable("refresh"); + toastr.success("归档护士提交成功！"); + } else { + toastr.error("归档护士提交失败！"); + } + } + }); + } else { + $("#flagStaff").val(1); + //弹窗提示是否强制性 + $("#WzRsult2").html(lockinfo); + $('#WZModal2').modal({ + backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 + keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 + show: true//弹出对话框 + }); + } + } else { toastr.error("必填项未选择！归档护士提交失败！"); } }); diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index 4e6ecee..60bdacf 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -171,7 +171,7 @@ if(tipLoad==1){ $("#table").bootstrapTable({ // 对应table标签的id //method: 'POST', - url: "${path}/fault/faultList", // 获取表格数据的url + url: "${path}/fault/getQualityControlList", // 获取表格数据的url contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行 cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true @@ -253,7 +253,7 @@ visitId:""+$("#visitId").val(), name:""+$("#name").val(), archivestate:"" + $("#archivestate").val(), - deptName: deptName.toString() + deptName: deptName.toString() }; return temp; @@ -317,9 +317,15 @@ field: 'dischargeDateTime', align: 'center', valign: 'middle', - // formatter: function (value, row, index) { - // return value - // } + formatter: function (value, row, index) { + var result=""; + if(value!=null && value!=""){ + result= value.substring(0, 10); + }else{ + result=value; + } + return result + } }, { title: '归档状态', @@ -351,33 +357,6 @@ } }, - // { - // title: '归档状态', - // field: 'archivestate', - // align: 'center', - // valign: 'middle', - // formatter: function (value, row, index) { - // //在院 未归档 归档中 初审 已归档 已认证 复审退回 - // var a = ''; - // if (value == "未归档") { - // a = '' + value + ''; - // } else if (value == "已归档") { - // a = '' + value + ''; - // } else if (value == "在院") { - // a = '' + value + ''; - // } else if (value == "归档中") { - // a = '' + value + ''; - // } else if (value == "初审") { - // a = '' + value + ''; - // } else if (value == "已认证") { - // a = '' + value + ''; - // } else if (value == "复审退回") { - // a = '' + value + ''; - // } - // return a; - // - // } - // }, { field: 'score', title: '评分(分)', @@ -389,16 +368,28 @@ //return changeDateFormat(value) } }, + { + field: 'price', + title: '扣分项', + //sortable: true, + align: 'center', + valign: 'middle', + formatter: function (value, row, index) { + return value; + //return changeDateFormat(value) + } + }, { field: 'backContent', title: '退回内容', + visible: false, formatter: function (value, row, index) { return value; //return changeDateFormat(value) } }, { - field: 'assortId', + field: 'typeName', title: '缺陷选项', valign: 'middle', formatter: function (value, row, index) { @@ -415,6 +406,12 @@ //return changeDateFormat(value) } }, + { + title: '主管医生', + field: 'doctorInCharge', + align: 'center', + valign: 'middle', + }, { field: 'createTime', title: '创建时间', diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 195c30a..9b236df 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -2083,7 +2083,7 @@ } else { if (days > deathExpired) { var day = days - deathExpired; - result = '已死亡(超期' + day + ')'; + result = '已死亡'; } else { result = '已死亡'; } @@ -2115,7 +2115,7 @@ //获取properties配置文件中的属性值 var expired = <%=res.getString("expired")%>; if (days > expired) { - a = '' + value + '(超期)'; + a = '' + value + ''; } else { a = '' + value + ''; } @@ -2182,9 +2182,9 @@ html = '';// '删除'; } if (row.archivestate == '初审') { - if (index != null && index != "" && index.indexOf("back") != -1) { + /*if (index != null && index != "" && index.indexOf("back") != -1) { html += ''; - } + }*/ if (index != null && index != "" && index.indexOf("last") != -1) { html += ''; } @@ -2354,7 +2354,7 @@ function rowStyle(row, index) { var style = {}; if (row.followingType != null) { - style={css:{'color':'#ed5565'}}; + style={css:{'color':'#76abed'}}; } return style; } diff --git a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp index 29d5d85..db109e2 100644 --- a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp @@ -261,24 +261,10 @@ - <%--
- - -
- - -
--%> + + +
+
+
+ + +
+ + + + + +
+ + + + +
+ + + + diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index ce71be1..cf923f4 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -1973,7 +1973,11 @@ align: 'center', valign: 'middle', formatter: function (value, row, index) { - return value.substring(0, 10); + var result=""; + if(value!=null && value!=""){ + result=value.substring(0, 10); + } + return result; } }, {