From 356e8a73893735cffd7c5d9be73d6927d93d914c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 27 Jul 2021 13:45:39 +0800 Subject: [PATCH] update --- .../java/com/lyms/hospitalapi/hs/ConnTools.java | 2 +- .../com/lyms/hospitalapi/hs/HsfyFmService.java | 61 +++++++++------------- .../operate/web/controller/CommonController.java | 11 +++- .../web/service/impl/PostReviewServiceImpl.java | 17 ++++++ 4 files changed, 54 insertions(+), 37 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/ConnTools.java index d12975a..b8d6c6a 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/ConnTools.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/ConnTools.java @@ -10,7 +10,7 @@ import java.sql.SQLException; public class ConnTools { private static String fmDirverClassName="com.microsoft.sqlserver.jdbc.SQLServerDriver"; - private static String fmUrl="jdbc:sqlserver://192.168.100.162:1433; DatabaseName=ogis_hsfy"; + private static String fmUrl="jdbc:sqlserver://172.16.18.162:1433; DatabaseName=ogis_hsfy"; private static String fmUser="sa"; private static String fmPassword="net2k"; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java index a5edf4a..dd61517 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java @@ -57,8 +57,7 @@ public class HsfyFmService { @Autowired private PatientServiceFacade patientServiceFacade; - @Autowired - private DzfyHisService dzfyHisService; + private static Map ONE_ENUMS = new HashMap<>(); @@ -132,25 +131,25 @@ public class HsfyFmService { " DUE_WEEK as DUE_WEEK, " + " DUE_DAY as DUE_DAY, " + " FETUS_NUM as FETUS_NUM, " + - " BABY_ASPHYXIAM as BABY_ASPHYXIAM, " + +// " BABY_ASPHYXIAM as BABY_ASPHYXIAM, " + " BABY_WEIGHT as BABY_WEIGHT, " + " BABY_HEIGHT as BABY_HEIGHT, " + - " BABY_APGAR_SCORE_ONE as BABY_APGAR_SCORE_ONE, " + - " BABY_APGAR_SCORE_FIVE as BABY_APGAR_SCORE_FIVE, " + - " BABY_APGAR_SCORE_TEN as BABY_APGAR_SCORE_TEN, " + +// " BABY_APGAR_SCORE_ONE as BABY_APGAR_SCORE_ONE, " + +// " BABY_APGAR_SCORE_FIVE as BABY_APGAR_SCORE_FIVE, " + +// " BABY_APGAR_SCORE_TEN as BABY_APGAR_SCORE_TEN, " + " BABY_PREGNANCY_OUT as BABY_PREGNANCY_OUT, " + " DELIVERY_MODE as DELIVERY_MODE, "+ - " TMCSIDE as TMCSIDE, " + - " TMCTYPE as TMCTYPE, " + - " MATERNAL_INFO as MATERNAL_INFO, " + +// " TMCSIDE as TMCSIDE, " + +// " TMCTYPE as TMCTYPE, " + +// " MATERNAL_INFO as MATERNAL_INFO, " + " PERINEAL_CONDITION as PERINEAL_CONDITION, " + - " SH_LOSE_BLOOD as SH_LOSE_BLOOD, " + - " TH_LOSE_BLOOD as TH_LOSE_BLOOD, " + - " DELIVER_DOCTOR as DELIVER_DOCTOR, " + - " PROD_PROCESS_ONE as PROD_PROCESS_ONE, " + - " PROD_PROCESS_TWO as PROD_PROCESS_TWO," + - " PROD_PROCESS_THREE as PROD_PROCESS_THREE, " + - " TOTAL_PROCESS as TOTAL_PROCESS, " + +// " SH_LOSE_BLOOD as SH_LOSE_BLOOD, " + +// " TH_LOSE_BLOOD as TH_LOSE_BLOOD, " + +// " DELIVER_DOCTOR as DELIVER_DOCTOR, " + +// " PROD_PROCESS_ONE as PROD_PROCESS_ONE, " + +// " PROD_PROCESS_TWO as PROD_PROCESS_TWO," + +// " PROD_PROCESS_THREE as PROD_PROCESS_THREE, " + +// " TOTAL_PROCESS as TOTAL_PROCESS, " + " PLACENTA_NUM as PLACENTA_NUM, " + " DELIVER_HOSPITAL as DELIVER_HOSPITAL, " + " DELIVER_DOCTOR as DELIVER_DOCTOR "; @@ -165,7 +164,7 @@ public class HsfyFmService { " CREATED > CONVERT(DATETIME,'" + start + "', 120) and CREATED <= CONVERT(DATETIME,'" + end + "', 120)" ; if (phone != null) { - sql+=" and phone = '"+phone+"'"; + sql+=" and IDCARD = '"+phone+"'"; } ExceptionUtils.catchException("sql====" +sql); List list = queryRunner.query(conn, sql, new BeanListHandler(Fm.class)); @@ -300,11 +299,11 @@ public class HsfyFmService { deliverAddRequest.setDueWeek(week); } - deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1) - Integer placenta_Num = allFm.getPLACENTA_NUM(); - if(placenta_Num!=null){ - deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1) - } +// deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1) +// Integer placenta_Num = allFm.getPLACENTA_NUM(); +// if(placenta_Num!=null){ +// deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1) +// } if ("完整".equals(allFm.getPERINEAL_CONDITION()) || "".equals(allFm.getPERINEAL_CONDITION())) { deliverAddRequest.setPerinealCondition("full"); } else if ("切开".equals(allFm.getPERINEAL_CONDITION()) || "侧切".equals(allFm.getPERINEAL_CONDITION())) { @@ -387,10 +386,11 @@ public class HsfyFmService { baby.setDeformity((allFm.getBABY_DEFORMITY()==null?0:1)); //畸形 0非畸形 1畸形 - String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT(); - if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){ - baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(allFm.getBABY_PREGNANCY_OUT())); // 妊娠结局 - } + //String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT(); +// if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){ +// baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(allFm.getBABY_PREGNANCY_OUT())); // 妊娠结局 +// } + baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局 baby.setDueTime(fmt.format(dueDate));//分娩时间 babies.add(baby); @@ -624,15 +624,6 @@ public class HsfyFmService { // request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务 // request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通 - if (patInfo != null && StringUtils.isNotEmpty(fm.getBHNUM())) - { - Map diags = dzfyHisService.queryHisBabyDiagnosis(fm.getBHNUM()); - if (diags != null && diags.size() > 0) - { - request.setBlNo(fm.getBHNUM()); - request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString()); - } - } //标准服务开通 request.setSerInfos(patientServiceFacade.defaultServiceOpen()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommonController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommonController.java index 50d4085..99cd4fb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommonController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommonController.java @@ -1,7 +1,7 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.hospitalapi.hs.HsfyFmService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -23,6 +23,15 @@ import com.lyms.platform.operate.web.service.ICommonServer; @Controller @RequestMapping("/common") public class CommonController extends BaseController { + @Autowired + private HsfyFmService hsfyFmService; + + @RequestMapping(method = RequestMethod.GET, value = "/hsfy") + @ResponseBody + public void hsfy(@RequestParam(required = false) String idCard,@RequestParam("start") String start,@RequestParam("end") String end) { + hsfyFmService.syncByPhone(start,end,idCard); + } + @Autowired private ICommonServer commonServer; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java index 68d6b5e..f9487de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java @@ -182,6 +182,23 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie tempMap.put("doctorName", null); } tempMap.put("phone", p == null ? null : StringUtils.encryPhone(p.getPhone())); + + + String gcDoctor = ""; + List patientses = mongoTemplate.find(Query.query(Criteria.where("pid").is(model.getPid()).and("yn").is(YnEnums.YES.getId())), Patients.class); + if (CollectionUtils.isNotEmpty(patientses)) + { + for (Patients pat : patientses) + { + if (StringUtils.isNotEmpty(pat.getGcdfDoctorId())) + { + gcDoctor = pat.getGcdfDoctorId(); + break; + } + } + } + tempMap.put("gcDoctor", gcDoctor); + rest.add(tempMap); } pageResult.setGrid(rest); -- 1.8.3.1