diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java index 2944b26..1b3951c 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java @@ -1,5 +1,6 @@ package com.lyms.hospitalapi.dtdyrm; +import com.lyms.hospitalapi.dzfy.DtFm; import com.lyms.hospitalapi.dzfy.Fm; import com.lyms.hospitalapi.qhddeyy.QhddeyyFmServiceImpl; import com.lyms.hospitalapi.qhdfy.FmItem; @@ -58,7 +59,7 @@ public class DtdyrmFmService implements IdtdyrmFmService { private static final String HOSPITALID = "2100002419"; @Override - public void queryFmPatient(List list) { + public void queryFmPatient(List list) { SaveFm sfm = new SaveFm(list); Thread t = new Thread(sfm); t.start(); @@ -68,9 +69,9 @@ public class DtdyrmFmService implements IdtdyrmFmService { public class SaveFm implements Runnable{ - private List allList; + private List allList; - public SaveFm(List list){ + public SaveFm(List list){ this.allList=list; } @@ -78,20 +79,20 @@ public class DtdyrmFmService implements IdtdyrmFmService { SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - System.out.println("fm=" + allList.toString()); + System.out.println("fm= startup"); List users = new ArrayList (); Date dueDate = null; List babies = new ArrayList <>(); MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest(); Patients patient =null; - for (Fm allFm : allList) { + for (DtFm allFm : allList) { // System.out.println("0-------------" + allFm.getBABY_PREGNANCY_OUT()); - if (!"1".equals(allFm.getBABY_PREGNANCY_OUT())) { + if (!"1".equals(allFm.getBaby_PREGNANCY_OUT())) { System.out.println("BABY_PREGNANCY_OUT != 1"); continue; } - if (StringUtils.isEmpty(allFm.getPHONE()) && StringUtils.isEmpty(allFm.getIDCARD())) { + if (StringUtils.isEmpty(allFm.getPhone()) && StringUtils.isEmpty(allFm.getIdcard())) { continue; } PatientsQuery query = new PatientsQuery(); @@ -100,7 +101,7 @@ public class DtdyrmFmService implements IdtdyrmFmService { //20201230 半年后把这个打开 // query.setType(1); //孕妇 // query.setDueStatus(0); //未终止妊娠 - String[] strs = new String[]{allFm.getPHONE(), allFm.getIDCARD()}; + String[] strs = new String[]{allFm.getPhone(), allFm.getIdcard()}; query.setPc(strs); //查询该孕妇是否在孕产婴系统中建档 // System.out.println("1----query--" + query.convertToQuery().convertToMongoQuery()); @@ -123,11 +124,11 @@ public class DtdyrmFmService implements IdtdyrmFmService { } else{ - if (StringUtils.isNotEmpty(allFm.getIDCARD())){ + if (StringUtils.isNotEmpty(allFm.getIdcard())&&CollectionUtils.isNotEmpty(users)){ PersonModel pmodel = new PersonModel(); - pmodel.setName(allFm.getNAME()); - pmodel.setPhone(allFm.getPHONE()); - pmodel.setCardNo(allFm.getIDCARD()); + pmodel.setName(allFm.getName()); + pmodel.setPhone(allFm.getPhone()); + pmodel.setCardNo(allFm.getIdcard()); pmodel.setType(3); pmodel.setModified(new Date()); @@ -139,16 +140,18 @@ public class DtdyrmFmService implements IdtdyrmFmService { patient.setHospitalId(HOSPITALID); patient.setFmHospital(HOSPITALID); patient.setFmDate(new Date()); - patient.setCardNo(allFm.getIDCARD()); + patient.setCardNo(allFm.getIdcard()); patient.setYn(1); + patient.setType(3); patient.setBookbuildingDate(new Date()); //patient.setBookbuildingDoctor(); - patient.setUsername(allFm.getNAME()); - patient.setPhone(allFm.getPHONE()); + patient.setUsername(allFm.getName()); + patient.setPhone(allFm.getPhone()); patient.setPid(resperson.getId()); + patient.setDueStatus(1); patient.setOperator(users.get(0).getId()); - patient.setLastMenses(DateUtil.getWeekDay(allFm.getDUE_WEEK().length()>2?-Integer.valueOf(allFm.getDUE_WEEK().substring(0,2)):-Integer.valueOf(allFm.getDUE_WEEK()))); - patient.setBirth(DateUtil.parseYMD(DateUtil.getBirthFromIdCard(allFm.getIDCARD()))); + patient.setLastMenses(DateUtil.getWeekDay(allFm.getDue_WEEK().length()>2?-Integer.valueOf(allFm.getDue_WEEK().substring(0,2)):-Integer.valueOf(allFm.getDue_WEEK()))); + patient.setBirth(DateUtil.parseYMD(DateUtil.getBirthFromIdCard(allFm.getIdcard()))); patient.setDeliverDoctor(String.valueOf(users.get(0).getId())); patient.setCreated(new Date()); patient.setModified(new Date()); @@ -162,8 +165,8 @@ public class DtdyrmFmService implements IdtdyrmFmService { if (patient != null && StringUtils.isNotEmpty(patient.getId())) { if (CollectionUtils.isNotEmpty(users) && users.get(0).getId() != null) { - if (!StringUtils.isNotEmpty(allFm.getBABY_DELIVERY_TIME())) { - Date dateTime = fmt.parse(allFm.getBABY_DELIVERY_TIME()); + if (StringUtils.isNotEmpty(allFm.getBaby_DELIVERY_TIME())) { + Date dateTime = fmt.parse(allFm.getBaby_DELIVERY_TIME()); if (dateTime==null) { continue; } else { @@ -179,9 +182,9 @@ public class DtdyrmFmService implements IdtdyrmFmService { Map map3 = new HashMap <>(); Map totalMap = new HashMap <>(); - Integer prod_Process_One = allFm.getPROD_PROCESS_ONE(); - Integer prod_Process_Two = allFm.getPROD_PROCESS_TWO(); - Integer prod_Process_Three = allFm.getPROD_PROCESS_THREE(); + Integer prod_Process_One = allFm.getProd_PROCESS_ONE(); + Integer prod_Process_Two = allFm.getProd_PROCESS_TWO(); + Integer prod_Process_Three = allFm.getProd_PROCESS_THREE(); if (prod_Process_One != null) { map1.put("h", String.valueOf(prod_Process_One.intValue() / 60)); map1.put("m", String.valueOf(prod_Process_One.intValue() % 60)); @@ -198,9 +201,9 @@ public class DtdyrmFmService implements IdtdyrmFmService { map.put("three", map3); } - if (StringUtils.isNotEmpty(allFm.getTOTAL_PROCESS())){ - int hProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())/60;//总产程小时数 - int mProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())%60;//总产程分钟数 + if (StringUtils.isNotEmpty(allFm.getTotal_PROCESS())){ + int hProcess = Integer.parseInt(allFm.getTotal_PROCESS())/60;//总产程小时数 + int mProcess = Integer.parseInt(allFm.getTotal_PROCESS())%60;//总产程分钟数 totalMap.put("h",String.valueOf(hProcess)); totalMap.put("m",String.valueOf(mProcess)); } @@ -208,54 +211,54 @@ public class DtdyrmFmService implements IdtdyrmFmService { deliverAddRequest.setTotalprocess(totalMap); // System.out.println("6----------" + allFm.getDELIVER_DOCTOR()); - deliverAddRequest.setDeliverDoctor(allFm.getDELIVER_DOCTOR()); + deliverAddRequest.setDeliverDoctor(allFm.getDeliver_DOCTOR()); deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate)); deliverAddRequest.setParentId(patient.getId()); deliverAddRequest.setPid(patient.getPid()); deliverAddRequest.setOperationCause("-"); String week = ""; - if (StringUtils.isNotEmpty(allFm.getDUE_WEEK())) { + if (StringUtils.isNotEmpty(allFm.getDue_WEEK())) { - week = allFm.getDUE_WEEK() + "周"; - if (StringUtils.isNotEmpty(allFm.getDUE_WEEK()) && StringUtils.isNotEmpty(allFm.getDUE_DAY())) { - week += allFm.getDUE_DAY() + "天"; + week = allFm.getDue_WEEK() + "周"; + if (StringUtils.isNotEmpty(allFm.getDue_WEEK()) && StringUtils.isNotEmpty(allFm.getDue_DAY())) { + week += allFm.getDue_DAY() + "天"; } deliverAddRequest.setDueWeek(week); } - deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1) - Integer placenta_Num = allFm.getPLACENTA_NUM(); + deliverAddRequest.setTireNumber(allFm.getFetus_NUM());// 胎数(之前赋值为死值1) + Integer placenta_Num = allFm.getPlacenta_NUM(); if (placenta_Num != null) { - deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1) + deliverAddRequest.setPlacenta(allFm.getPlacenta_NUM().toString());// 胎盘(之前赋值为死值1) } - if ("完好".equals(allFm.getPERINEAL_CONDITION()) || "".equals(allFm.getPERINEAL_CONDITION())) { + if ("完好".equals(allFm.getPerineal_CONDITION()) || "".equals(allFm.getPerineal_CONDITION())) { deliverAddRequest.setPerinealCondition("full"); - } else if ("会阴切开".equals(allFm.getPERINEAL_CONDITION()) || "侧切".equals(allFm.getPERINEAL_CONDITION())) { + } else if ("会阴切开".equals(allFm.getPerineal_CONDITION()) || "侧切".equals(allFm.getPerineal_CONDITION())) { deliverAddRequest.setPerinealCondition("split"); } - if ("一度裂伤".equals(allFm.getPERINEAL_CONDITION())) { + if ("一度裂伤".equals(allFm.getPerineal_CONDITION())) { deliverAddRequest.setSiLielevel(1); - } else if ("二度裂伤".equals(allFm.getPERINEAL_CONDITION())) { + } else if ("二度裂伤".equals(allFm.getPerineal_CONDITION())) { deliverAddRequest.setSiLielevel(2); - } else if ("三度裂伤".equals(allFm.getPERINEAL_CONDITION())) { + } else if ("三度裂伤".equals(allFm.getPerineal_CONDITION())) { deliverAddRequest.setSiLielevel(3); } - Integer th_Lose = allFm.getTH_LOSE_BLOOD(); + Integer th_Lose = allFm.getTh_LOSE_BLOOD(); if (th_Lose != null) { - if (StringUtils.isNotEmpty(allFm.getTH_LOSE_BLOOD().toString())) { - deliverAddRequest.settHloseBloodL(Double.parseDouble(allFm.getTH_LOSE_BLOOD().toString())); + if (StringUtils.isNotEmpty(allFm.getTh_LOSE_BLOOD().toString())) { + deliverAddRequest.settHloseBloodL(Double.parseDouble(allFm.getTh_LOSE_BLOOD().toString())); } } Map deliveryMode = new HashMap(); //分娩方式 String fmfs = ""; - if (allFm.getDELIVERY_MODE() != null - && ("手术产".equals(allFm.getDELIVERY_MODE()) - ||"剖宫产".equals(allFm.getDELIVERY_MODE())) + if (allFm.getDelivery_MODE() != null + && ("手术产".equals(allFm.getDelivery_MODE()) + ||"剖宫产".equals(allFm.getDelivery_MODE())) ) { fmfs = FmTypeEnums.O1.getId(); } else { @@ -267,9 +270,9 @@ public class DtdyrmFmService implements IdtdyrmFmService { List extPlacentas = new ArrayList <>(); MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta(); String tpmcType = ""; //胎盘娩出方式 - if ("手术产".equals(allFm.getTMCTYPE()) || "手取胎盘".equals(allFm.getTMCTYPE())) { + if ("手术产".equals(allFm.getTmctype()) || "手取胎盘".equals(allFm.getTmctype())) { tpmcType = TpmcTypeEnums.O2.getId(); - } else if ("自然产出".equals(allFm.getTMCTYPE()) || "自然娩出".equals(allFm.getTMCTYPE())) { + } else if ("自然产出".equals(allFm.getTmctype()) || "自然娩出".equals(allFm.getTmctype())) { tpmcType = TpmcTypeEnums.O.getId(); } extPlacenta.setTpmcType(tpmcType); @@ -279,11 +282,11 @@ public class DtdyrmFmService implements IdtdyrmFmService { //儿童 MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby(); - baby.setBabyWeight(allFm.getBABY_WEIGHT() == null ? null : allFm.getBABY_WEIGHT().toString()); + baby.setBabyWeight(allFm.getBaby_WEIGHT() == null ? null : allFm.getBaby_WEIGHT().toString()); Map as = new HashMap <>(); - String pf1 = String.valueOf(allFm.getBABY_APGAR_SCORE_ONE()); - String pf5 = String.valueOf(allFm.getBABY_APGAR_SCORE_FIVE()); - String pf10 = String.valueOf(allFm.getBABY_APGAR_SCORE_TEN()); + String pf1 = String.valueOf(allFm.getBaby_APGAR_SCORE_ONE()); + String pf5 = String.valueOf(allFm.getBaby_APGAR_SCORE_FIVE()); + String pf10 = String.valueOf(allFm.getBaby_APGAR_SCORE_TEN()); if (pf1 != null) { as.put("pf1", pf1); } @@ -296,10 +299,10 @@ public class DtdyrmFmService implements IdtdyrmFmService { baby.setApgarScore(as); - baby.setBabyGender("男".equals(allFm.getBABY_SEX()) ? "1" : "0"); - String babyHeight = String.valueOf(allFm.getBABY_HEIGHT()); - String babyWeight = String.valueOf(allFm.getBABY_WEIGHT()); - Integer baby_Asphyxiam = allFm.getBABY_ASPHYXIAM(); + baby.setBabyGender("男".equals(allFm.getBaby_SEX()) ? "1" : "0"); + String babyHeight = String.valueOf(allFm.getBaby_HEIGHT()); + String babyWeight = String.valueOf(allFm.getBaby_WEIGHT()); + Integer baby_Asphyxiam = allFm.getBaby_ASPHYXIAM(); if (babyHeight != null) { baby.setBabyHeight(babyHeight);//新生儿生长 } @@ -310,9 +313,9 @@ public class DtdyrmFmService implements IdtdyrmFmService { baby.setAsphyxiaM(String.valueOf(baby_Asphyxiam)); //窒息分钟 } - baby.setDeformity((allFm.getBABY_DEFORMITY() == null ? 0 : 1)); //畸形 0非畸形 1畸形 + baby.setDeformity((allFm.getBaby_DEFORMITY() == null ? 0 : 1)); //畸形 0非畸形 1畸形 - String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT()=="1"?"活产":""; + String baby_Pregnancy_Out = allFm.getBaby_PREGNANCY_OUT()=="1"?"活产":""; if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){ baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局 } @@ -333,6 +336,7 @@ public class DtdyrmFmService implements IdtdyrmFmService { ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest); if (users != null && users.size() > 0) { matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); + System.out.println("fm= end"); } } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/IdtdyrmFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/IdtdyrmFmService.java index d658092..0f3be4a 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/IdtdyrmFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/IdtdyrmFmService.java @@ -1,9 +1,10 @@ package com.lyms.hospitalapi.dtdyrm; +import com.lyms.hospitalapi.dzfy.DtFm; import com.lyms.hospitalapi.dzfy.Fm; import java.util.List; public interface IdtdyrmFmService { - public void queryFmPatient(List list); + public void queryFmPatient(List list); } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DtFm.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DtFm.java new file mode 100644 index 0000000..e32eac5 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DtFm.java @@ -0,0 +1,556 @@ +package com.lyms.hospitalapi.dzfy; + +/** + * 大同分娩管理 + */ +public class DtFm { + private String id; + private String bhnum; + private String vccardno; + private String name; + private String phone; + private String idcard; + private String addr; + private Integer fetus_NUM; + private Integer placenta_NUM; + private String delivery_MODE; + private String operation_CAUSE; + private Integer prod_PROCESS_ONE; + private Integer prod_PROCESS_TWO; + private Integer prod_PROCESS_THREE; + private String total_PROCESS; + private Integer silie_LEVEL; + private Integer needle_NUM; + private String maternal_INFO; + private String death_CAUSE; + private String chbp; + private String ch2BP; + private Integer breath; + private Integer pulse; + private Integer oh_LOSE_BLOOD; + private Integer th_LOSE_BLOOD; + private String baby_SEX; + private String tmctype; + private String perineal_CONDITION; + private String um_EXTYPE; + private Integer rh_LOSE_BLOOD; + private Integer sh_LOSE_BLOOD; + private String lose_BLOOD_CAUSE; + private String ocs; + private String deliver_HOSPITAL; + private String deliver_DOCTOR; + private String baby_FETAL_PRESENTATION; + private String baby_FETAL_POSITION; + private String baby_DELIVERY_TIME; + private Integer baby_WEIGHT; + private Integer baby_HEIGHT; + private Integer baby_DEFORMITY; + private Integer baby_APGAR_SCORE_ONE; + private Integer baby_APGAR_SCORE_FIVE; + private Integer baby_APGAR_SCORE_TEN; + private Integer baby_ASPHYXIAM; + private String baby_SICK; + private Integer baby_TOUCH_STARTM; + private Integer baby_TOUCH_LASTM; + private String baby_EARLYSUCK; + private String tmcside; + private String tlong; + private String twidth; + private String theight; + private String tweight; + private String um_LENGTH; + private String modified; + private String baby_PREGNANCY_OUT; + private String created; + private String due_WEEK; + private String due_DAY; + private String vision; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBhnum() { + return bhnum; + } + + public void setBhnum(String bhnum) { + this.bhnum = bhnum; + } + + public String getVccardno() { + return vccardno; + } + + public void setVccardno(String vccardno) { + this.vccardno = vccardno; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getIdcard() { + return idcard; + } + + public void setIdcard(String idcard) { + this.idcard = idcard; + } + + public String getAddr() { + return addr; + } + + public void setAddr(String addr) { + this.addr = addr; + } + + public Integer getFetus_NUM() { + return fetus_NUM; + } + + public void setFetus_NUM(Integer fetus_NUM) { + this.fetus_NUM = fetus_NUM; + } + + public Integer getPlacenta_NUM() { + return placenta_NUM; + } + + public void setPlacenta_NUM(Integer placenta_NUM) { + this.placenta_NUM = placenta_NUM; + } + + public String getDelivery_MODE() { + return delivery_MODE; + } + + public void setDelivery_MODE(String delivery_MODE) { + this.delivery_MODE = delivery_MODE; + } + + public String getOperation_CAUSE() { + return operation_CAUSE; + } + + public void setOperation_CAUSE(String operation_CAUSE) { + this.operation_CAUSE = operation_CAUSE; + } + + public Integer getProd_PROCESS_ONE() { + return prod_PROCESS_ONE; + } + + public void setProd_PROCESS_ONE(Integer prod_PROCESS_ONE) { + this.prod_PROCESS_ONE = prod_PROCESS_ONE; + } + + public Integer getProd_PROCESS_TWO() { + return prod_PROCESS_TWO; + } + + public void setProd_PROCESS_TWO(Integer prod_PROCESS_TWO) { + this.prod_PROCESS_TWO = prod_PROCESS_TWO; + } + + public Integer getProd_PROCESS_THREE() { + return prod_PROCESS_THREE; + } + + public void setProd_PROCESS_THREE(Integer prod_PROCESS_THREE) { + this.prod_PROCESS_THREE = prod_PROCESS_THREE; + } + + public String getTotal_PROCESS() { + return total_PROCESS; + } + + public void setTotal_PROCESS(String total_PROCESS) { + this.total_PROCESS = total_PROCESS; + } + + public Integer getSilie_LEVEL() { + return silie_LEVEL; + } + + public void setSilie_LEVEL(Integer silie_LEVEL) { + this.silie_LEVEL = silie_LEVEL; + } + + public Integer getNeedle_NUM() { + return needle_NUM; + } + + public void setNeedle_NUM(Integer needle_NUM) { + this.needle_NUM = needle_NUM; + } + + public String getMaternal_INFO() { + return maternal_INFO; + } + + public void setMaternal_INFO(String maternal_INFO) { + this.maternal_INFO = maternal_INFO; + } + + public String getDeath_CAUSE() { + return death_CAUSE; + } + + public void setDeath_CAUSE(String death_CAUSE) { + this.death_CAUSE = death_CAUSE; + } + + public String getChbp() { + return chbp; + } + + public void setChbp(String chbp) { + this.chbp = chbp; + } + + public String getCh2BP() { + return ch2BP; + } + + public void setCh2BP(String ch2BP) { + this.ch2BP = ch2BP; + } + + public Integer getBreath() { + return breath; + } + + public void setBreath(Integer breath) { + this.breath = breath; + } + + public Integer getPulse() { + return pulse; + } + + public void setPulse(Integer pulse) { + this.pulse = pulse; + } + + public Integer getOh_LOSE_BLOOD() { + return oh_LOSE_BLOOD; + } + + public void setOh_LOSE_BLOOD(Integer oh_LOSE_BLOOD) { + this.oh_LOSE_BLOOD = oh_LOSE_BLOOD; + } + + public Integer getTh_LOSE_BLOOD() { + return th_LOSE_BLOOD; + } + + public void setTh_LOSE_BLOOD(Integer th_LOSE_BLOOD) { + this.th_LOSE_BLOOD = th_LOSE_BLOOD; + } + + public String getBaby_SEX() { + return baby_SEX; + } + + public void setBaby_SEX(String baby_SEX) { + this.baby_SEX = baby_SEX; + } + + public String getTmctype() { + return tmctype; + } + + public void setTmctype(String tmctype) { + this.tmctype = tmctype; + } + + public String getPerineal_CONDITION() { + return perineal_CONDITION; + } + + public void setPerineal_CONDITION(String perineal_CONDITION) { + this.perineal_CONDITION = perineal_CONDITION; + } + + public String getUm_EXTYPE() { + return um_EXTYPE; + } + + public void setUm_EXTYPE(String um_EXTYPE) { + this.um_EXTYPE = um_EXTYPE; + } + + public Integer getRh_LOSE_BLOOD() { + return rh_LOSE_BLOOD; + } + + public void setRh_LOSE_BLOOD(Integer rh_LOSE_BLOOD) { + this.rh_LOSE_BLOOD = rh_LOSE_BLOOD; + } + + public Integer getSh_LOSE_BLOOD() { + return sh_LOSE_BLOOD; + } + + public void setSh_LOSE_BLOOD(Integer sh_LOSE_BLOOD) { + this.sh_LOSE_BLOOD = sh_LOSE_BLOOD; + } + + public String getLose_BLOOD_CAUSE() { + return lose_BLOOD_CAUSE; + } + + public void setLose_BLOOD_CAUSE(String lose_BLOOD_CAUSE) { + this.lose_BLOOD_CAUSE = lose_BLOOD_CAUSE; + } + + public String getOcs() { + return ocs; + } + + public void setOcs(String ocs) { + this.ocs = ocs; + } + + public String getDeliver_HOSPITAL() { + return deliver_HOSPITAL; + } + + public void setDeliver_HOSPITAL(String deliver_HOSPITAL) { + this.deliver_HOSPITAL = deliver_HOSPITAL; + } + + public String getDeliver_DOCTOR() { + return deliver_DOCTOR; + } + + public void setDeliver_DOCTOR(String deliver_DOCTOR) { + this.deliver_DOCTOR = deliver_DOCTOR; + } + + public String getBaby_FETAL_PRESENTATION() { + return baby_FETAL_PRESENTATION; + } + + public void setBaby_FETAL_PRESENTATION(String baby_FETAL_PRESENTATION) { + this.baby_FETAL_PRESENTATION = baby_FETAL_PRESENTATION; + } + + public String getBaby_FETAL_POSITION() { + return baby_FETAL_POSITION; + } + + public void setBaby_FETAL_POSITION(String baby_FETAL_POSITION) { + this.baby_FETAL_POSITION = baby_FETAL_POSITION; + } + + public String getBaby_DELIVERY_TIME() { + return baby_DELIVERY_TIME; + } + + public void setBaby_DELIVERY_TIME(String baby_DELIVERY_TIME) { + this.baby_DELIVERY_TIME = baby_DELIVERY_TIME; + } + + public Integer getBaby_WEIGHT() { + return baby_WEIGHT; + } + + public void setBaby_WEIGHT(Integer baby_WEIGHT) { + this.baby_WEIGHT = baby_WEIGHT; + } + + public Integer getBaby_HEIGHT() { + return baby_HEIGHT; + } + + public void setBaby_HEIGHT(Integer baby_HEIGHT) { + this.baby_HEIGHT = baby_HEIGHT; + } + + public Integer getBaby_DEFORMITY() { + return baby_DEFORMITY; + } + + public void setBaby_DEFORMITY(Integer baby_DEFORMITY) { + this.baby_DEFORMITY = baby_DEFORMITY; + } + + public Integer getBaby_APGAR_SCORE_ONE() { + return baby_APGAR_SCORE_ONE; + } + + public void setBaby_APGAR_SCORE_ONE(Integer baby_APGAR_SCORE_ONE) { + this.baby_APGAR_SCORE_ONE = baby_APGAR_SCORE_ONE; + } + + public Integer getBaby_APGAR_SCORE_FIVE() { + return baby_APGAR_SCORE_FIVE; + } + + public void setBaby_APGAR_SCORE_FIVE(Integer baby_APGAR_SCORE_FIVE) { + this.baby_APGAR_SCORE_FIVE = baby_APGAR_SCORE_FIVE; + } + + public Integer getBaby_APGAR_SCORE_TEN() { + return baby_APGAR_SCORE_TEN; + } + + public void setBaby_APGAR_SCORE_TEN(Integer baby_APGAR_SCORE_TEN) { + this.baby_APGAR_SCORE_TEN = baby_APGAR_SCORE_TEN; + } + + public Integer getBaby_ASPHYXIAM() { + return baby_ASPHYXIAM; + } + + public void setBaby_ASPHYXIAM(Integer baby_ASPHYXIAM) { + this.baby_ASPHYXIAM = baby_ASPHYXIAM; + } + + public String getBaby_SICK() { + return baby_SICK; + } + + public void setBaby_SICK(String baby_SICK) { + this.baby_SICK = baby_SICK; + } + + public Integer getBaby_TOUCH_STARTM() { + return baby_TOUCH_STARTM; + } + + public void setBaby_TOUCH_STARTM(Integer baby_TOUCH_STARTM) { + this.baby_TOUCH_STARTM = baby_TOUCH_STARTM; + } + + public Integer getBaby_TOUCH_LASTM() { + return baby_TOUCH_LASTM; + } + + public void setBaby_TOUCH_LASTM(Integer baby_TOUCH_LASTM) { + this.baby_TOUCH_LASTM = baby_TOUCH_LASTM; + } + + public String getBaby_EARLYSUCK() { + return baby_EARLYSUCK; + } + + public void setBaby_EARLYSUCK(String baby_EARLYSUCK) { + this.baby_EARLYSUCK = baby_EARLYSUCK; + } + + public String getTmcside() { + return tmcside; + } + + public void setTmcside(String tmcside) { + this.tmcside = tmcside; + } + + public String getTlong() { + return tlong; + } + + public void setTlong(String tlong) { + this.tlong = tlong; + } + + public String getTwidth() { + return twidth; + } + + public void setTwidth(String twidth) { + this.twidth = twidth; + } + + public String getTheight() { + return theight; + } + + public void setTheight(String theight) { + this.theight = theight; + } + + public String getTweight() { + return tweight; + } + + public void setTweight(String tweight) { + this.tweight = tweight; + } + + public String getUm_LENGTH() { + return um_LENGTH; + } + + public void setUm_LENGTH(String um_LENGTH) { + this.um_LENGTH = um_LENGTH; + } + + public String getModified() { + return modified; + } + + public void setModified(String modified) { + this.modified = modified; + } + + public String getBaby_PREGNANCY_OUT() { + return baby_PREGNANCY_OUT; + } + + public void setBaby_PREGNANCY_OUT(String baby_PREGNANCY_OUT) { + this.baby_PREGNANCY_OUT = baby_PREGNANCY_OUT; + } + + public String getCreated() { + return created; + } + + public void setCreated(String created) { + this.created = created; + } + + public String getDue_WEEK() { + return due_WEEK; + } + + public void setDue_WEEK(String due_WEEK) { + this.due_WEEK = due_WEEK; + } + + public String getDue_DAY() { + return due_DAY; + } + + public void setDue_DAY(String due_DAY) { + this.due_DAY = due_DAY; + } + + public String getVision() { + return vision; + } + + public void setVision(String vision) { + this.vision = vision; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FmController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FmController.java index d50b406..45961cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FmController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FmController.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.hospitalapi.dtdyrm.IdtdyrmFmService; +import com.lyms.hospitalapi.dzfy.DtFm; import com.lyms.hospitalapi.dzfy.Fm; import com.lyms.hospitalapi.linchengfy.LcfyFmService; import com.lyms.hospitalapi.lpfy.IlpFyFmService; @@ -8,6 +9,7 @@ import com.lyms.hospitalapi.nanhe.InhFyFmService; import com.lyms.hospitalapi.qhddeyy.IQhddeyyFmServcie; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -53,11 +55,20 @@ public class FmController { llcFyFmService.queryFmPatient(models); }if("45".equals(models.get(0).getVision())){ qhddeyyFmServcie.queryFmPatient(models); - }if ("50".equals(models.get(0).getVision())){ - idtdyrmFmService.queryFmPatient(models); } return JsonUtil.array2JsonString(models); } + @RequestMapping(method = RequestMethod.POST, value = "/dtSaveFmData") + @ResponseBody + public String dtSaveFmData(@Valid @RequestBody List models, HttpServletRequest httpServletRequest){ + if (CollectionUtils.isNotEmpty(models)){ + if ("50".equals(models.get(0).getVision())){ + idtdyrmFmService.queryFmPatient(models); + } + } + return JsonUtil.array2JsonString(models); + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index fa3f0e9..2a22f1c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -220,7 +220,7 @@ public class AntExRecordFacade { if("2100002419".equals(hospitalId)){//大同 Users u = usersService.getUsers(userId); //产科网络 及 医务科 看全科室的 - if(2100004954 == u.getDeptId() || 2100004955 == u.getDeptId()){ + if(2100004948 == u.getDeptId() || 2100004960 == u.getDeptId()){ if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){ antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 5abcecf..afa9c44 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2707,7 +2707,7 @@ public class MatDeliverFacade { if("2100002419".equals(hid)){//大同 Users u = usersService.getUsers(childbirthManagerRequest.getOperatorId()); //产科网络 及 医务科 看全科室的 - if(2100004954 == u.getDeptId() || 2100004955 == u.getDeptId()){ + if(2100004948 == u.getDeptId() || 2100004960 == u.getDeptId()){ if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); } @@ -2875,7 +2875,7 @@ public class MatDeliverFacade { if (null != childbirthManagerRequest.getCesareanTimeType()) { matDeliverQuery.setCesareanTimeType(childbirthManagerRequest.getCesareanTimeType()); } - + System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); // 这里就设置分页内容 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); 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 a20ec75..d9ff477 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 @@ -1748,6 +1748,7 @@ public class PatientFacade extends BaseServiceImpl { PatientsQuery patientsQuery = new PatientsQuery();//complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); patientsQuery.setHospitalId(hospital); patientsQuery.setNeed(needPage); + patientsQuery.setType(type); patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); patientsQuery.setPage(riskPatientsQueryRequest.getPage()); //查询符合条件的孕妇 @@ -3191,7 +3192,7 @@ public class PatientFacade extends BaseServiceImpl { if("2100002419".equals(hospitalId)){ Users u = usersService.getUsers(patientManagerRequest.getOperatorId()); //产科网络 及 医务科 看全科室的 - if(2100004954 == u.getDeptId() || 2100004955 == u.getDeptId()){ + if(2100004948 == u.getDeptId() || 2100004960 == u.getDeptId()){ patientsQuery.setBookbuildingDoctor(StringUtils.isEmpty(patientManagerRequest.getBookbuildingDoctor()) ? null : patientManagerRequest.getBookbuildingDoctor()); }else if(4 == u.getZhiChenId()){//主任看本科室 List bookbuildingDoctorList = new ArrayList<>();