From 1acd65984a245a9782e8fc592e8e90234ee494c3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 28 Jun 2021 10:22:28 +0800 Subject: [PATCH] update --- .../lyms/platform/pojo/PreEugenicsBaseModel.java | 1 + .../com/lyms/platform/pojo/PremaritalCheckup.java | 10 +++++ .../web/controller/PreEugenicsBaseController.java | 21 ++++++++- .../operate/web/controller/TestController.java | 30 ++++++++++--- .../platform/operate/web/facade/PatientFacade.java | 21 +++++++++ .../web/facade/PremaritalCheckupFacade.java | 4 ++ .../operate/web/facade/ResidentsArchiveFacade.java | 4 +- .../web/request/PremaritalCheckupAddRequest.java | 10 +++++ .../web/result/PremaritalCheckupResult.java | 9 ++++ .../operate/web/service/IPreEugenicsService.java | 4 ++ .../web/service/impl/PreEugebicsServiceImpl.java | 51 ++++++++++++++++++++-- 11 files changed, 151 insertions(+), 14 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java index f6455da..62cc779 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java @@ -378,6 +378,7 @@ public class PreEugenicsBaseModel extends BaseModel { //是否抽血 1不抽血 private Integer checkBlood; + private Integer isSync; public static long getSerialVersionUID() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index 7225653..821d262 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -460,6 +460,16 @@ public class PremaritalCheckup extends BaseModel { //1 未同步 2已经同步 private Integer isSync; + //采血编号 + private String cxNum; + + public String getCxNum() { + return cxNum; + } + + public void setCxNum(String cxNum) { + this.cxNum = cxNum; + } public Integer getIsSync() { return isSync; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java index abc6902..68d8405 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.operate.web.request.YqysParamRequest; import com.lyms.platform.operate.web.service.impl.PreEugebicsServiceImpl; import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.pojo.CervicalCancerModel; import com.lyms.platform.pojo.PreEugenicsBaseModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -259,10 +260,28 @@ public class PreEugenicsBaseController extends BaseController { @TokenRequired @RequestMapping(value = "/exportRcCount", method = RequestMethod.GET) public void exportRcCount(@RequestParam String time, HttpServletRequest request, HttpServletResponse response) { - iPreEugenicsService.exportRcCount(time, getUserId(request),response); + iPreEugenicsService.exportRcCount(time, getUserId(request), response); } + /** + * 孕前优生 + * @param p + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/syncPreEugenicsBase") + @ResponseBody + public BaseResponse syncPreEugenicsBase(@RequestBody PreEugenicsBaseModel p, + HttpServletRequest request) { + return iPreEugenicsService.syncPreEugenicsBase(p); + } + @RequestMapping(method = RequestMethod.GET, value = "/doSyncPreEugenicsBase") + @ResponseBody + public BaseResponse doSyncPreEugenicsBase( + HttpServletRequest request) { + return iPreEugenicsService.doSyncPreEugenicsBase(); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 91e2540..5a93eff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -24,10 +24,8 @@ import com.lyms.platform.operate.web.facade.*; import com.lyms.platform.operate.web.request.AntExListQueryRequest; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.MaternalDeliverResult; -import com.lyms.platform.operate.web.service.BabyEyeCheckService; -import com.lyms.platform.operate.web.service.IBloodPressureService; -import com.lyms.platform.operate.web.service.PatientWeightService; -import com.lyms.platform.operate.web.service.SyncDataTaskService; +import com.lyms.platform.operate.web.service.*; +import com.lyms.platform.operate.web.service.impl.CervicalCancerServiceImpl; import com.lyms.platform.operate.web.worker.AntexOtherHighRiskWorker; import com.lyms.platform.operate.web.worker.AntexcOtherHighRiskWorker; import com.lyms.platform.operate.web.worker.BabyBuildSerToPatientSerWorker; @@ -4471,9 +4469,6 @@ public class TestController extends BaseController { return "syncPatientByHospitalId finish"; } - @Autowired - private PremaritalCheckupFacade premaritalCheckupFacade; - @RequestMapping(value = "/setNumCode", method = RequestMethod.GET) @ResponseBody public String setNumCode() { @@ -4606,4 +4601,25 @@ public class TestController extends BaseController { } return "updateBabyFirstPyName finish"; } + + @RequestMapping(value = "/doLhfySync", method = RequestMethod.GET) + @ResponseBody + public String doLhfySync() { + residentsArchiveFacade.doSyncResidentsArchive(); + iPreEugenicsService.doSyncPreEugenicsBase(); + cancerScreenService.doSyncCancerScreen(); + cervicalCancerService.doSyncCervicalCancer(); + premaritalCheckupFacade.doSyncPremaritalCheckup(); + return "success"; + } + @Autowired + private IPreEugenicsService iPreEugenicsService; + @Autowired + private CancerScreeningFacade cancerScreenService; + @Autowired + private CervicalCancerServiceImpl cervicalCancerService; + @Autowired + private PremaritalCheckupFacade premaritalCheckupFacade; + @Autowired + private ResidentsArchiveFacade residentsArchiveFacade; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 7435dd6..f4be188 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -15,10 +15,12 @@ import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.service.IPreEugenicsService; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.service.RareBloodGroupService; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; +import com.lyms.platform.operate.web.service.impl.CervicalCancerServiceImpl; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.JxlsUtils; import com.lyms.platform.operate.web.worker.*; @@ -3272,4 +3274,23 @@ public class PatientFacade extends BaseServiceImpl { return new BaseObjectResponse().setData(datas).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } + + public void doLhfySync() { + System.out.println("doLhfySync-----------------------------"); + residentsArchiveFacade.doSyncResidentsArchive(); + iPreEugenicsService.doSyncPreEugenicsBase(); + cancerScreenService.doSyncCancerScreen(); + cervicalCancerService.doSyncCervicalCancer(); + premaritalCheckupFacade.doSyncPremaritalCheckup(); + } + @Autowired + private IPreEugenicsService iPreEugenicsService; + @Autowired + private CancerScreeningFacade cancerScreenService; + @Autowired + private CervicalCancerServiceImpl cervicalCancerService; + @Autowired + private PremaritalCheckupFacade premaritalCheckupFacade; + @Autowired + private ResidentsArchiveFacade residentsArchiveFacade; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index a521596..d4162ed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -249,6 +249,7 @@ public class PremaritalCheckupFacade { //返回婚检信息 public PremaritalCheckupResult getResult(PremaritalCheckup result) { PremaritalCheckupResult checkupResult = new PremaritalCheckupResult(); + checkupResult.setCxNum(result.getCxNum()); checkupResult.setId(result.getId()); checkupResult.setParentId(result.getId()); checkupResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime())); @@ -649,6 +650,7 @@ public class PremaritalCheckupFacade { } else { checkup.setSexType(2); } + checkup.setCxNum(addRequest.getCxNum()); /* 配偶信息 */ if (addRequest.getDeliverStatus() != null) { @@ -1172,6 +1174,7 @@ public class PremaritalCheckupFacade { map.put("username", username); //map.put("certificateNum", FunvCommonUtil.getId(certificateNum)); map.put("certificateNum", certificateNum); + map.put("cxNum", checkup.getCxNum()); map.put("phone", phone); if (null != checkup.getJianChaJieGuo()) { if (2 == checkup.getJianChaJieGuo()) { @@ -1215,6 +1218,7 @@ public class PremaritalCheckupFacade { cnames.put("premaritalUpTime", "婚检时间"); cnames.put("username", "姓名"); cnames.put("certificateNum", "证件号"); + cnames.put("cxNum", "采血编号"); cnames.put("phone", "联系方式"); cnames.put("jianChaJieGuo", "结果"); cnames.put("yiXueYiJian", "医学意见"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index e199863..6bde44a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -991,7 +991,7 @@ public class ResidentsArchiveFacade { map.put("nationId", FunvCommonUtil.getBaseicConfigByid(data.getNationId(), basicConfigService)); map.put("marriageId", FunvCommonUtil.getBaseicConfigByid(data.getMarriageId(), basicConfigService)); map.put("certificateTypeId", FunvCommonUtil.getBaseicConfigByid(data.getCertificateTypeId(), basicConfigService)); - map.put("certificateNum", FunvCommonUtil.getId(data.getCertificateNum())); + map.put("certificateNum", data.getCertificateNum()); map.put("censusTypeId", FunvCommonUtil.getBaseicConfigByid(data.getCensusTypeId(), basicConfigService)); map.put("liveTypeId", FunvCommonUtil.getBaseicConfigByid(data.getLiveTypeId(), basicConfigService)); map.put("levelTypeId", FunvCommonUtil.getBaseicConfigByid(data.getLevelTypeId(), basicConfigService)); @@ -1003,7 +1003,7 @@ public class ResidentsArchiveFacade { } } map.put("age", data.getAge()); - map.put("phone", DefenceUtils.getPhone(data.getPhone())); + map.put("phone", data.getPhone()); map.put("workUnit", data.getWorkUnit()); map.put("residence", CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(), data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index 97c2fbe..f9de313 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -450,6 +450,16 @@ public class PremaritalCheckupAddRequest { //用户签名 private String userSign; + //采血编号 + private String cxNum; + + public String getCxNum() { + return cxNum; + } + + public void setCxNum(String cxNum) { + this.cxNum = cxNum; + } public String getBaseSign() { return baseSign; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index bd11089..c83d860 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -426,7 +426,16 @@ public class PremaritalCheckupResult { private String fkjjState; private String numCode; + //采血编号 + private String cxNum; + public String getCxNum() { + return cxNum; + } + + public void setCxNum(String cxNum) { + this.cxNum = cxNum; + } public String getNumCode() { return numCode; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java index 8764aed..bfe29d0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java @@ -4,6 +4,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest; import com.lyms.platform.operate.web.request.PreEugenicsBaseRequest; +import com.lyms.platform.pojo.PreEugenicsBaseModel; import javax.servlet.http.HttpServletResponse; @@ -28,4 +29,7 @@ public interface IPreEugenicsService extends IFormReportService> getDatas(String time, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Organization organization = organizationService.getOrganization(Integer.valueOf(hospitalId)); @@ -1019,6 +1020,48 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen } return total; } + + + @Override + public BaseResponse syncPreEugenicsBase(PreEugenicsBaseModel p) { + PreEugenicsBaseModel model = mongoTemplate.findOne(Query.query(Criteria.where("id").is(p.getId())), PreEugenicsBaseModel.class); + if (model != null) { + Query query = Query.query(Criteria.where("id").is(p.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(p)); + mongoTemplate.updateFirst(query, update, CervicalCancerModel.class); + } + else + { + mongoTemplate.insert(p); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + @Override + public BaseResponse doSyncPreEugenicsBase() { + List preEugenicsBaseModels = mongoTemplate.find(Query.query(Criteria.where("isSync").is(1)), PreEugenicsBaseModel.class); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(preEugenicsBaseModels)) + { + for (PreEugenicsBaseModel model : preEugenicsBaseModels) + { + model.setIsSync(2); + String json = JsonUtil.obj2Str1(model); + System.out.println(json); + String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/cervicalCancer/syncCervicalCancer",json); + + + Query query = Query.query(Criteria.where("id").is(model.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); + mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); + + System.out.println("doSyncPreEugenicsBase=" + syncRsult); + } + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url"); } class Total { -- 1.8.3.1