diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntex.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntex.java index 93849b4..23451fa 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntex.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntex.java @@ -9,12 +9,21 @@ public class ReportAntex { private Integer id; private String fid; private String parentId; + private String sourceId; private String pid; private Date checkDate; private Date nextCheckTime; private String yn; private Date created; + public String getSourceId() { + return sourceId; + } + + public void setSourceId(String sourceId) { + this.sourceId = sourceId; + } + public Integer getId() { return id; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntexchu.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntexchu.java index 21a882d..2e93b1a 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntexchu.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntexchu.java @@ -13,8 +13,18 @@ public class ReportAntexchu { private String hospitalId; private String pid; private String parentId; + private String sourceId; private Date created; + + public String getSourceId() { + return sourceId; + } + + public void setSourceId(String sourceId) { + this.sourceId = sourceId; + } + public Date getCreated() { return created; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMatdeliver.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMatdeliver.java index 14f6025..29f8e9f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMatdeliver.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMatdeliver.java @@ -14,6 +14,15 @@ public class ReportMatdeliver { private Date created; private String fmHospital; private String hospitalId; + private String sourceId; + + public String getSourceId() { + return sourceId; + } + + public void setSourceId(String sourceId) { + this.sourceId = sourceId; + } public Integer getId() { return id; diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml index 2aed92a..225745c 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml @@ -1182,7 +1182,8 @@ hospitalId, pid, parentId, - created + created, + sourceId ) VALUES ( #{cid}, #{checkTime}, @@ -1190,7 +1191,8 @@ #{hospitalId}, #{pid}, #{parentId}, - #{created} + #{created}, + #{sourceId} ) @@ -1209,7 +1211,8 @@ checkDate, nextCheckTime, yn, - created + created, + sourceId ) VALUES ( #{fid}, #{parentId}, @@ -1217,7 +1220,8 @@ #{checkDate}, #{nextCheckTime}, #{yn}, - #{created} + #{created}, + #{sourceId} ) @@ -1236,7 +1240,8 @@ dueDate1, created, fmHospital, - hospitalId + hospitalId, + sourceId ) VALUES ( #{mid}, #{parentId}, @@ -1244,7 +1249,8 @@ #{dueDate1}, #{created}, #{fmHospital}, - #{hospitalId} + #{hospitalId}, + #{sourceId} ) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index 5b07f32..20b0756 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.AreaCountFacade; +import com.lyms.platform.operate.web.facade.PatientSyncMysqlFacade; import com.lyms.platform.operate.web.request.HealthManagerListRequest; import com.lyms.platform.permission.model.ServiceListQuery; import org.slf4j.Logger; @@ -32,6 +33,8 @@ public class AreaCountController extends BaseController { @Autowired private AreaCountFacade areaCountFacade; + @Autowired + private PatientSyncMysqlFacade patientSyncMysqlFacade; @ResponseBody @RequestMapping(value = "/area/{id}", method = RequestMethod.GET) @@ -79,6 +82,7 @@ public class AreaCountController extends BaseController { return areaCountFacade.getCheckPointCount(nodeType, time, hospitalId, provinceId, cityId, areaId, loginState.getId(), checkTime); } + /** * 产检节点建档明细 * @@ -383,4 +387,30 @@ public class AreaCountController extends BaseController { return todayEnd.getTime(); } + + /** + * 质控表统计 + * @param request + * @param time + * @param hospitalId + * @param provinceId + * @param cityId + * @param areaId + * @param nodeType + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getAreaCheckCount") + @ResponseBody + @TokenRequired + public BaseResponse getAreaCheckCount(HttpServletRequest request, + @RequestParam(required = false) String time, + @RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String provinceId, + @RequestParam(required = false) String cityId, + @RequestParam(required = false) String areaId, + @RequestParam(required = false) Integer nodeType) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return patientSyncMysqlFacade.getAreaCheckCount(time, hospitalId, provinceId, cityId, areaId, loginState.getId()); + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index 9c9bf1b..8f1721f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -1337,7 +1337,15 @@ public class PatientSyncMysqlFacade { for(AntExChuModel antExChu : antExChus) { + + Patients pat = patientsService.findOnePatientById(antExChu.getParentId()); + if (pat == null) + { + continue; + } + ReportAntexchu reportAntexchu = new ReportAntexchu(); + reportAntexchu.setSourceId(StringUtils.isNotEmpty(pat.getSource()) ? pat.getSource() : antExChu.getParentId()); reportAntexchu.setCid(antExChu.getId()); try { @@ -1409,7 +1417,14 @@ public class PatientSyncMysqlFacade { for(AntenatalExaminationModel antex : antexs) { + Patients pat = patientsService.findOnePatientById(antex.getParentId()); + if (pat == null) + { + continue; + } + ReportAntex reportAntex = new ReportAntex(); + reportAntex.setSourceId(StringUtils.isNotEmpty(pat.getSource()) ? pat.getSource() : antex.getParentId()); reportAntex.setFid(antex.getId()); try { @@ -1480,7 +1495,15 @@ public class PatientSyncMysqlFacade { for(MaternalDeliverModel maternalDeliverModel : maternalDeliverModels) { + + Patients pat = patientsService.findOnePatientById(maternalDeliverModel.getParentId()); + if (pat == null) + { + continue; + } + ReportMatdeliver reportMatdeliver = new ReportMatdeliver(); + reportMatdeliver.setSourceId(StringUtils.isNotEmpty(pat.getSource()) ? pat.getSource() : maternalDeliverModel.getParentId()); reportMatdeliver.setMid(maternalDeliverModel.getId()); try { ConvertUtils.register(new DateLocaleConverter(), Date.class); @@ -1496,4 +1519,12 @@ public class PatientSyncMysqlFacade { page++; } } + + + + public BaseObjectResponse getAreaCheckCount(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer userId) + { + + return null; + } }