diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ChildCareEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ChildCareEnums.java new file mode 100644 index 0000000..e20be79 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ChildCareEnums.java @@ -0,0 +1,115 @@ +package com.lyms.platform.common.enums; + +/** + * @auther yangfei + * @createTime 2018年03月13日 17时42分 + * @discription + */ +public class ChildCareEnums { + public enum JCTCEnums { + A(1, "1月龄"), + B(3, "3月龄"), + C(6, "6月龄"), + D(8, "8月龄"), + E(12, "12月龄"), + F(18, "18月龄"), + G(24, "24月龄"), + H(30, "30月龄"), + I(36, "36月龄"), + J(48, "4岁"), + K(60, "5岁"), + L(72, "6岁"); + + private int id; + private String name; + + JCTCEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + public enum CNQKEnums { + A(1, "好"), + L(2, "不好"); + private int id; + private String name; + + CNQKEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + public enum YDCPEnums { + A(1, "＞90%"), + B(2, "90%"), + C(3, "75%-90%"), + D(4, "75%"), + E(5, "50%-75%"), + F(6, "50%"), + G(7, "25%-50%"), + H(8, "25%"), + I(9, "10%-25%"), + J(10, "10%建议康复训练"), + K(11, "5%-10%建议康复训练"), + L(12, "5%建议康复训练"), + M(13, "＜5%建议康复训练"); + private int id; + private String name; + + YDCPEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index 39a4fa7..22c7e70 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -3,14 +3,13 @@ package com.lyms.platform.pojo; import com.lyms.platform.beans.SerialIdEnum; import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; -import org.springframework.data.mongodb.core.mapping.Field; import java.util.Date; import java.util.Map; /** * 儿保检查 - * + * * @author lqy */ @Document(collection = "lyms_babycheck") @@ -30,72 +29,52 @@ public class BabyCheckModel extends BaseModel { //月龄下拉框 private String ylSelect; - + // 检查套餐 + private Integer tcType; /******问诊情况****/ - //主要抚养人 private String mainFoster; - //喂养方式 private String feedType; - //小便 private String pee; - //大便 private String excrement; - //睡眠情况 private String sleep; - //活动小时 private String activity; - //维生素D private String vitaminD; - //辅食 private String assistFood; - //家庭措施 private String homeMeasure; - //发病情况 private String morbidity; - //药物过敏史 private String drugGllergic; - /******问诊情况****/ /******一般检查****/ - - //体温 private String temperature; - //体重 private String weight; //身长 private String height; //头围 private String head; - //身长别体重 private String heightWeight; - private String chestw; - //发育评价 private String growthEvaluate; - /******一般检查****/ - /******儿科检查****/ - //胆红素 头 private String bilirubinHead; @@ -114,7 +93,6 @@ public class BabyCheckModel extends BaseModel { //面色 private String faceColor; - //皮肤 private String skin; @@ -215,47 +193,748 @@ public class BabyCheckModel extends BaseModel { //是否高危儿童 0 非高危 1高危 private Integer highRisk; - - // 修改时间 private Date modified; - //创建时间 private Date created; - private String hospitalId; - //体重评价 private String weightEvaluate; //身长评价 private String heightEvaluate; //头围评价 private String headEvaluate; - private Date birth; - //检查月龄 private Integer checkMonth; - - //运动测评 private String sportsEvaluation; - //心理行为 private String heartAction; - //问诊其他 private String askOther; - //儿科检查其他 private String babyCheckOther; - //辅助检查其他 private String assistCheckOther; - //脐部 private Map navel; + /******新加问诊情况****/ + //吃奶情况 + public String cnqk; + //每天吃奶次数 + public String mtcnNum; + //小便次数 + public String xbNum; + //大便次数 + public String dbNum; + //脐带脱落的时间 + public String qdtlTime; + //皮肤黄染消退的时间 + public String pfhrTime; + //维生素AD + public String wssAd; + //两次随访间患病情况 + public Map douhbqk; + /******新加问诊情况****/ + + /******新增儿科检查****/ + //口腔 + public String kq; + // 出牙数 + public String cyNum; + //龋齿 + public String qcNum; + //咽/扁桃体 + public String btt; + //心肺 + public String xf; + /******新增儿科检查****/ + + /******新增辅助检查开始****/ + /**心理行为发育测评**/ + // CIASS筛查 + private Map xlClass; + // dq + private String xldq; + /**心理行为发育测评**/ + //尿碘 + public String nd; + /*****乙肝五项***/ + // 乙肝表面抗原 + private String ygbmky; + //乙肝表面抗体 + private String ygbmkt; + //乙肝e抗原 + private String ygeky; + // 乙肝e抗体 + private String ygekt; + // 乙肝核心抗体 + private String yghxkt; + //铜 + private String wlTong; + //锌 + private String wlXin; + //钙 + private String wlGai; + //镁 + private String wlMei; + //铁 + private String wlTie; + //铅 + private String wlQian; + //镉 + private String wlGe; + //锰 + private String wlMeng; + /*****乙肝五项***/ + + /*****乙肝五项定量***/ + // 乙肝表面抗原 + private String ygbmkyNum; + //乙肝表面抗体 + private String ygbmktNum; + //乙肝e抗原 + private String ygekyNum; + // 乙肝e抗体 + private String ygektNum; + // 乙肝核心抗体 + private String yghxktNum; + /*****乙肝五项定量***/ + + /*****肝功能***/ + //血清谷丙转氨酶 + private String xqgbzam; + //血清谷草转氨酶 + private String xqgczam; + //白蛋白 + private String albumin; + //总胆红素 + private String totalBilirubin; + //结合胆红素 + private String jhBilirubin; + /*****肝功能***/ + + /*****便常规***/ + //颜色 + private String bcgYs; + //性状 + private String bcgXz; + //红细胞 + private String bcgHbx; + //白细胞 + private String bcgBxb; + //上皮细胞 + private String bcgSpxb; + //肿瘤细胞 + private String bcgZlxb; + //淀粉颗粒 + private String bcgDfkl; + //脂肪颗粒 + private String bcgZfkl; + //肌纤维 + private String bcgJxw; + //植物纤维 + private String bcgZwxw; + //致病菌 + private String bcgZbj; + //真菌 + private String bcgZj; + //寄生虫 + private String bcgJsc; + //原虫 + private String bcgYc; + //气味 + private String bcgQw; + /*****便常规***/ + //维生素A + private String wssa; + //维生素D + private String jcwd; + //维生素E + private String wsse; + //乳汁分析 + private Map rzfx; + + //M-CHAT筛查 + private Map chatSc; + //儿童早期语言发育测评 + private Map yyfyTest; + //智力测评 + private String zlcp; + //孤独症筛查 + private String gdzsc; + //膳食分析 + private String ssfx; + //感觉统合能力检查 + private String gjzh; + //入学能力检查 + private String rxnl; + //先心病筛查 + private String xxbsc; + //智力筛查（DDST） + private String zlsc; + //其他及系统现有的辅助检查项 + private String qtfz; + + + + public Integer getTcType() { + return tcType; + } + + public void setTcType(Integer tcType) { + this.tcType = tcType; + } + + public String getCnqk() { + return cnqk; + } + + public void setCnqk(String cnqk) { + this.cnqk = cnqk; + } + + public String getMtcnNum() { + return mtcnNum; + } + + public void setMtcnNum(String mtcnNum) { + this.mtcnNum = mtcnNum; + } + + public String getXbNum() { + return xbNum; + } + + public void setXbNum(String xbNum) { + this.xbNum = xbNum; + } + + public String getDbNum() { + return dbNum; + } + + public void setDbNum(String dbNum) { + this.dbNum = dbNum; + } + + public String getQdtlTime() { + return qdtlTime; + } + + public void setQdtlTime(String qdtlTime) { + this.qdtlTime = qdtlTime; + } + + public String getPfhrTime() { + return pfhrTime; + } + + public void setPfhrTime(String pfhrTime) { + this.pfhrTime = pfhrTime; + } + + public String getWssAd() { + return wssAd; + } + + public void setWssAd(String wssAd) { + this.wssAd = wssAd; + } + + public Map getDouhbqk() { + return douhbqk; + } + + public void setDouhbqk(Map douhbqk) { + this.douhbqk = douhbqk; + } + + public String getKq() { + return kq; + } + + public void setKq(String kq) { + this.kq = kq; + } + + public String getCyNum() { + return cyNum; + } + + public void setCyNum(String cyNum) { + this.cyNum = cyNum; + } + + public String getQcNum() { + return qcNum; + } + + public void setQcNum(String qcNum) { + this.qcNum = qcNum; + } + + public String getBtt() { + return btt; + } + + public void setBtt(String btt) { + this.btt = btt; + } + + public String getXf() { + return xf; + } + + public void setXf(String xf) { + this.xf = xf; + } + + public Map getXlClass() { + return xlClass; + } + + public void setXlClass(Map xlClass) { + this.xlClass = xlClass; + } + + public String getXldq() { + return xldq; + } + + public void setXldq(String xldq) { + this.xldq = xldq; + } + + public String getNd() { + return nd; + } + + public void setNd(String nd) { + this.nd = nd; + } + + public String getYgbmky() { + return ygbmky; + } + + public void setYgbmky(String ygbmky) { + this.ygbmky = ygbmky; + } + + public String getYgbmkt() { + return ygbmkt; + } + + public void setYgbmkt(String ygbmkt) { + this.ygbmkt = ygbmkt; + } + + public String getYgeky() { + return ygeky; + } + + public void setYgeky(String ygeky) { + this.ygeky = ygeky; + } + + public String getYgekt() { + return ygekt; + } + + public void setYgekt(String ygekt) { + this.ygekt = ygekt; + } + + public String getYghxkt() { + return yghxkt; + } + + public void setYghxkt(String yghxkt) { + this.yghxkt = yghxkt; + } + + public String getWlTong() { + return wlTong; + } + + public void setWlTong(String wlTong) { + this.wlTong = wlTong; + } + + public String getWlXin() { + return wlXin; + } + + public void setWlXin(String wlXin) { + this.wlXin = wlXin; + } + + public String getWlGai() { + return wlGai; + } + + public void setWlGai(String wlGai) { + this.wlGai = wlGai; + } + + public String getWlMei() { + return wlMei; + } + + public void setWlMei(String wlMei) { + this.wlMei = wlMei; + } + + public String getWlTie() { + return wlTie; + } + + public void setWlTie(String wlTie) { + this.wlTie = wlTie; + } + + public String getWlQian() { + return wlQian; + } + + public void setWlQian(String wlQian) { + this.wlQian = wlQian; + } + + public String getWlGe() { + return wlGe; + } + + public void setWlGe(String wlGe) { + this.wlGe = wlGe; + } + + public String getWlMeng() { + return wlMeng; + } + + public void setWlMeng(String wlMeng) { + this.wlMeng = wlMeng; + } + + public String getYgbmkyNum() { + return ygbmkyNum; + } + + public void setYgbmkyNum(String ygbmkyNum) { + this.ygbmkyNum = ygbmkyNum; + } + + public String getYgbmktNum() { + return ygbmktNum; + } + + public void setYgbmktNum(String ygbmktNum) { + this.ygbmktNum = ygbmktNum; + } + + public String getYgekyNum() { + return ygekyNum; + } + + public void setYgekyNum(String ygekyNum) { + this.ygekyNum = ygekyNum; + } + + public String getYgektNum() { + return ygektNum; + } + + public void setYgektNum(String ygektNum) { + this.ygektNum = ygektNum; + } + + public String getYghxktNum() { + return yghxktNum; + } + + public void setYghxktNum(String yghxktNum) { + this.yghxktNum = yghxktNum; + } + + public String getXqgbzam() { + return xqgbzam; + } + + public void setXqgbzam(String xqgbzam) { + this.xqgbzam = xqgbzam; + } + + public String getXqgczam() { + return xqgczam; + } + + public void setXqgczam(String xqgczam) { + this.xqgczam = xqgczam; + } + + public String getAlbumin() { + return albumin; + } + + public void setAlbumin(String albumin) { + this.albumin = albumin; + } + + public String getTotalBilirubin() { + return totalBilirubin; + } + + public void setTotalBilirubin(String totalBilirubin) { + this.totalBilirubin = totalBilirubin; + } + + public String getJhBilirubin() { + return jhBilirubin; + } + + public void setJhBilirubin(String jhBilirubin) { + this.jhBilirubin = jhBilirubin; + } + + public String getBcgYs() { + return bcgYs; + } + + public void setBcgYs(String bcgYs) { + this.bcgYs = bcgYs; + } + + public String getBcgXz() { + return bcgXz; + } + + public void setBcgXz(String bcgXz) { + this.bcgXz = bcgXz; + } + + public String getBcgHbx() { + return bcgHbx; + } + + public void setBcgHbx(String bcgHbx) { + this.bcgHbx = bcgHbx; + } + + public String getBcgBxb() { + return bcgBxb; + } + + public void setBcgBxb(String bcgBxb) { + this.bcgBxb = bcgBxb; + } + + public String getBcgSpxb() { + return bcgSpxb; + } + + public void setBcgSpxb(String bcgSpxb) { + this.bcgSpxb = bcgSpxb; + } + + public String getBcgZlxb() { + return bcgZlxb; + } + + public void setBcgZlxb(String bcgZlxb) { + this.bcgZlxb = bcgZlxb; + } + + public String getBcgDfkl() { + return bcgDfkl; + } + + public void setBcgDfkl(String bcgDfkl) { + this.bcgDfkl = bcgDfkl; + } + + public String getBcgZfkl() { + return bcgZfkl; + } + + public void setBcgZfkl(String bcgZfkl) { + this.bcgZfkl = bcgZfkl; + } + + public String getBcgJxw() { + return bcgJxw; + } + + public void setBcgJxw(String bcgJxw) { + this.bcgJxw = bcgJxw; + } + + public String getBcgZwxw() { + return bcgZwxw; + } + + public void setBcgZwxw(String bcgZwxw) { + this.bcgZwxw = bcgZwxw; + } + + public String getBcgZbj() { + return bcgZbj; + } + + public void setBcgZbj(String bcgZbj) { + this.bcgZbj = bcgZbj; + } + + public String getBcgZj() { + return bcgZj; + } + + public void setBcgZj(String bcgZj) { + this.bcgZj = bcgZj; + } + + public String getBcgJsc() { + return bcgJsc; + } + + public void setBcgJsc(String bcgJsc) { + this.bcgJsc = bcgJsc; + } + + public String getBcgYc() { + return bcgYc; + } + + public void setBcgYc(String bcgYc) { + this.bcgYc = bcgYc; + } + + public String getBcgQw() { + return bcgQw; + } + + public void setBcgQw(String bcgQw) { + this.bcgQw = bcgQw; + } + + public String getWssa() { + return wssa; + } + + public void setWssa(String wssa) { + this.wssa = wssa; + } + + public String getJcwd() { + return jcwd; + } + + public void setJcwd(String jcwd) { + this.jcwd = jcwd; + } + + public String getWsse() { + return wsse; + } + + public void setWsse(String wsse) { + this.wsse = wsse; + } + + public Map getRzfx() { + return rzfx; + } + + public void setRzfx(Map rzfx) { + this.rzfx = rzfx; + } + + public Map getChatSc() { + return chatSc; + } + + public void setChatSc(Map chatSc) { + this.chatSc = chatSc; + } + + public Map getYyfyTest() { + return yyfyTest; + } + + public void setYyfyTest(Map yyfyTest) { + this.yyfyTest = yyfyTest; + } + + public String getZlcp() { + return zlcp; + } + + public void setZlcp(String zlcp) { + this.zlcp = zlcp; + } + + public String getGdzsc() { + return gdzsc; + } + + public void setGdzsc(String gdzsc) { + this.gdzsc = gdzsc; + } + + public String getSsfx() { + return ssfx; + } + + public void setSsfx(String ssfx) { + this.ssfx = ssfx; + } + + public String getGjzh() { + return gjzh; + } + + public void setGjzh(String gjzh) { + this.gjzh = gjzh; + } + + public String getRxnl() { + return rxnl; + } + + public void setRxnl(String rxnl) { + this.rxnl = rxnl; + } + + public String getXxbsc() { + return xxbsc; + } + + public void setXxbsc(String xxbsc) { + this.xxbsc = xxbsc; + } + + public String getZlsc() { + return zlsc; + } + + public void setZlsc(String zlsc) { + this.zlsc = zlsc; + } + + public String getQtfz() { + return qtfz; + } + + public void setQtfz(String qtfz) { + this.qtfz = qtfz; + } + + /******新增辅助检查结束****/ + + public Map getNavel() { return navel; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 5f640a8..2f3ef05 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web; +import com.lyms.platform.common.enums.ChildCareEnums; +import com.lyms.platform.common.utils.EnumUtil; import com.lyms.platform.pojo.BasicConfig; import net.sourceforge.pinyin4j.PinyinHelper; import org.apache.log4j.Logger; @@ -16,6 +18,11 @@ public class Test { private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE"); public static void main(String[] args) throws Exception { + //月龄套餐 + //月龄套餐 + List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class); + System.out.println(jctc); + /* Mongo mongo = new Mongo("119.90.57.26", 10001); UserCredentials credentials = new UserCredentials("platform", "platform123"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index f8e5837..333b274 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -156,10 +156,104 @@ public class BabyCheckFacade { private BabyCheckModel getBabyCheckModel(BabyCheckRequest request) { BabyCheckModel model = new BabyCheckModel(); + //新加字段 + model.setTcType(request.getTcType()); + model.setCnqk(request.getCnqk()); + model.setMtcnNum(request.getMtcnNum()); + model.setXbNum(request.getXbNum()); + model.setDbNum(request.getDbNum()); + model.setQdtlTime(request.getQdtlTime()); + model.setPfhrTime(request.getPfhrTime()); + model.setWssAd(request.getWssAd()); + model.setDouhbqk(request.getDouhbqk()); + model.setKq(request.getKq()); + model.setCyNum(request.getCyNum()); + model.setQcNum(request.getQcNum()); + model.setBtt(request.getBtt()); + model.setXf(request.getXf()); + model.setXlClass(request.getXlClass()); + model.setXldq(request.getXldq()); + model.setNd(request.getNd()); + model.setYgbmky(request.getYgbmky()); + model.setYgeky(request.getYgeky()); + model.setYgekt(request.getYgekt()); + model.setYghxkt(request.getYghxkt()); + model.setWlTong(request.getWlTong()); + model.setWlXin(request.getWlXin()); + model.setWlGai(request.getWlGai()); + model.setWlMei(request.getWlMei()); + model.setWlTie(request.getWlTie()); + model.setWlQian(request.getWlQian()); + model.setWlGe(request.getWlGe()); + model.setWlMeng(request.getWlMeng()); + model.setYgbmkyNum(request.getYgbmkyNum()); + model.setYgbmktNum(request.getYgbmktNum()); + model.setYgekyNum(request.getYgekyNum()); + model.setYgektNum(request.getYgektNum()); + model.setYghxktNum(request.getYghxktNum()); + model.setXqgbzam(request.getXqgbzam()); + model.setXqgczam(request.getXqgczam()); + model.setAlbumin(request.getAlbumin()); + model.setTotalBilirubin(request.getTotalBilirubin()); + model.setJhBilirubin(request.getJhBilirubin()); + model.setBcgYs(request.getBcgYs()); + model.setBcgXz(request.getBcgXz()); + model.setBcgHbx(request.getBcgHbx()); + model.setBcgBxb(request.getBcgBxb()); + model.setBcgSpxb(request.getBcgSpxb()); + //肿瘤细胞 + model.setBcgZlxb(request.getBcgZlxb()); + //淀粉颗粒 + model.setBcgDfkl(request.getBcgDfkl()); + //脂肪颗粒 + model.setBcgZfkl(request.getBcgZfkl()); + //肌纤维 + model.setBcgJxw(request.getBcgJxw()); + //植物纤维 + model.setBcgZwxw(request.getBcgZwxw()); + //致病菌 + model.setBcgZbj(request.getBcgZbj()); + //真菌 + model.setBcgZj(request.getBcgZj()); + //寄生虫 + model.setBcgJsc(request.getBcgJsc()); + //原虫 + model.setBcgYc(request.getBcgYc()); + //气味 + model.setBcgQw(request.getBcgQw()); + /*****便常规***/ + //维生素A + model.setWssa(request.getWssa()); + //维生素D + model.setJcwd(request.getJcwd()); + //维生素E + model.setWsse(request.getWsse()); + //乳汁分析 + model.setRzfx(request.getRzfx()); + //M-CHAT筛查 + model.setChatSc(request.getChatSc()); + //儿童早期语言发育测评 + model.setYyfyTest(request.getYyfyTest()); + //智力测评 + model.setZlcp(request.getZlcp()); + //孤独症筛查 + model.setGdzsc(request.getGdzsc()); + //膳食分析 + model.setSsfx(request.getSsfx()); + //感觉统合能力检查 + model.setGjzh(request.getGjzh()); + //入学能力检查 + model.setRxnl(request.getRxnl()); + //先心病筛查 + model.setXxbsc(request.getXxbsc()); + //智力筛查（DDST） + model.setZlsc(request.getZlsc()); + //其他及系统现有的辅助检查项 + model.setQtfz(request.getQtfz()); + model.setYn(YnEnums.YES.getId()); model.setBuildId(request.getBuildId()); - model.setYlSelect(request.getYlSelect()); model.setMainFoster(request.getMainFoster()); model.setFeedType(request.getFeedType()); @@ -168,7 +262,7 @@ public class BabyCheckFacade { model.setSleep(request.getSleep()); model.setActivity(request.getActivity()); model.setVitaminD(request.getVitaminD()); - model.setAssistFood(request.getAssistFood()); + model.setAssistFood(JsonUtil.obj2JsonString(request.getAssistFood())); model.setHomeMeasure(request.getHomeMeasure()); model.setMorbidity(request.getMorbidity()); @@ -178,7 +272,8 @@ public class BabyCheckFacade { model.setWeight(request.getWeight()); model.setHead(request.getHead()); model.setHeightWeight(request.getHeightWeight()); - model.setGrowthEvaluate(request.getGrowthEvaluate() == null ? "" : JsonUtil.array2JsonString(request.getGrowthEvaluate())); + model.setGrowthEvaluate(request.getGrowthEvaluate() == null ? + "" : JsonUtil.array2JsonString(request.getGrowthEvaluate())); model.setBilirubinHead(request.getBilirubinHead()); @@ -186,25 +281,25 @@ public class BabyCheckFacade { model.setBilirubinBelly(request.getBilirubinBelly()); model.setBregma(JsonUtil.obj2JsonString(request.getBregma())); model.setTooth(request.getTooth()); - model.setFaceColor(request.getFaceColor()); - model.setSkin(request.getSkin()); + model.setFaceColor(JsonUtil.obj2JsonString(request.getFaceColor())); + model.setSkin(JsonUtil.obj2JsonString(request.getSkin())); model.setEye(request.getEye()); model.setEyesight(request.getEyesight()); model.setEar(request.getEar()); - model.setHearing(request.getHearing()); - model.setNeck(request.getNeck()); - model.setChest(request.getChest()); + model.setHearing(JsonUtil.obj2JsonString(request.getHearing())); + model.setNeck(JsonUtil.obj2JsonString(request.getNeck())); + model.setChest(JsonUtil.obj2JsonString(request.getChest())); model.setBelly(request.getBelly()); model.setSpineFours(request.getSpineFours()); - model.setPortaGenitals(request.getPortaGenitals()); + model.setPortaGenitals(JsonUtil.obj2JsonString(request.getPortaGenitals())); model.setStepStatus(request.getStepStatus()); - model.setStoopStatus(request.getStoopStatus()); - model.setStoopSign(request.getStoopSign()); + model.setStoopStatus(JsonUtil.obj2JsonString(request.getStoopStatus())); + model.setStoopSign(JsonUtil.obj2JsonString(request.getStoopSign())); model.setNerve(request.getNerve()); model.setBonez(request.getBonez()); - model.setHipJoint(request.getHipJoint()); + model.setHipJoint(JsonUtil.obj2JsonString(request.getHipJoint())); model.setHemoglobin(request.getHemoglobin()); model.setWhiteCell(request.getWhiteCell()); model.setPlatelet(request.getPlatelet()); @@ -250,8 +345,7 @@ public class BabyCheckFacade { model.setBabyCheckOther(request.getBabyCheckOther()); model.setAssistCheckOther(request.getAssistCheckOther()); model.setNavel(request.getNavel()); - - + //新加字段 return model; } @@ -1033,6 +1127,101 @@ public class BabyCheckFacade { BabyCheckResult model = new BabyCheckResult(); model.setId(checkModel.getId()); + //新加字段 + model.setTcType(checkModel.getTcType()); + model.setCnqk(checkModel.getCnqk()); + model.setMtcnNum(checkModel.getMtcnNum()); + model.setXbNum(checkModel.getXbNum()); + model.setDbNum(checkModel.getDbNum()); + model.setQdtlTime(checkModel.getQdtlTime()); + model.setPfhrTime(checkModel.getPfhrTime()); + model.setWssAd(checkModel.getWssAd()); + model.setDouhbqk(checkModel.getDouhbqk()); + model.setKq(checkModel.getKq()); + model.setCyNum(checkModel.getCyNum()); + model.setQcNum(checkModel.getQcNum()); + model.setBtt(checkModel.getBtt()); + model.setXf(checkModel.getXf()); + model.setXlClass(checkModel.getXlClass()); + model.setXldq(checkModel.getXldq()); + model.setNd(checkModel.getNd()); + model.setYgbmky(checkModel.getYgbmky()); + model.setYgeky(checkModel.getYgeky()); + model.setYgekt(checkModel.getYgekt()); + model.setYghxkt(checkModel.getYghxkt()); + model.setWlTong(checkModel.getWlTong()); + model.setWlXin(checkModel.getWlXin()); + model.setWlGai(checkModel.getWlGai()); + model.setWlMei(checkModel.getWlMei()); + model.setWlTie(checkModel.getWlTie()); + model.setWlQian(checkModel.getWlQian()); + model.setWlGe(checkModel.getWlGe()); + model.setWlMeng(checkModel.getWlMeng()); + model.setYgbmkyNum(checkModel.getYgbmkyNum()); + model.setYgbmktNum(checkModel.getYgbmktNum()); + model.setYgekyNum(checkModel.getYgekyNum()); + model.setYgektNum(checkModel.getYgektNum()); + model.setYghxktNum(checkModel.getYghxktNum()); + model.setXqgbzam(checkModel.getXqgbzam()); + model.setXqgczam(checkModel.getXqgczam()); + model.setAlbumin(checkModel.getAlbumin()); + model.setTotalBilirubin(checkModel.getTotalBilirubin()); + model.setJhBilirubin(checkModel.getJhBilirubin()); + model.setBcgYs(checkModel.getBcgYs()); + model.setBcgXz(checkModel.getBcgXz()); + model.setBcgHbx(checkModel.getBcgHbx()); + model.setBcgBxb(checkModel.getBcgBxb()); + model.setBcgSpxb(checkModel.getBcgSpxb()); + //肿瘤细胞 + model.setBcgZlxb(checkModel.getBcgZlxb()); + //淀粉颗粒 + model.setBcgDfkl(checkModel.getBcgDfkl()); + //脂肪颗粒 + model.setBcgZfkl(checkModel.getBcgZfkl()); + //肌纤维 + model.setBcgJxw(checkModel.getBcgJxw()); + //植物纤维 + model.setBcgZwxw(checkModel.getBcgZwxw()); + //致病菌 + model.setBcgZbj(checkModel.getBcgZbj()); + //真菌 + model.setBcgZj(checkModel.getBcgZj()); + //寄生虫 + model.setBcgJsc(checkModel.getBcgJsc()); + //原虫 + model.setBcgYc(checkModel.getBcgYc()); + //气味 + model.setBcgQw(checkModel.getBcgQw()); + /*****便常规***/ + //维生素A + model.setWssa(checkModel.getWssa()); + //维生素D + model.setJcwd(checkModel.getJcwd()); + //维生素E + model.setWsse(checkModel.getWsse()); + //乳汁分析 + model.setRzfx(checkModel.getRzfx()); + //M-CHAT筛查 + model.setChatSc(checkModel.getChatSc()); + //儿童早期语言发育测评 + model.setYyfyTest(checkModel.getYyfyTest()); + //智力测评 + model.setZlcp(checkModel.getZlcp()); + //孤独症筛查 + model.setGdzsc(checkModel.getGdzsc()); + //膳食分析 + model.setSsfx(checkModel.getSsfx()); + //感觉统合能力检查 + model.setGjzh(checkModel.getGjzh()); + //入学能力检查 + model.setRxnl(checkModel.getRxnl()); + //先心病筛查 + model.setXxbsc(checkModel.getXxbsc()); + //智力筛查（DDST） + model.setZlsc(checkModel.getZlsc()); + //其他及系统现有的辅助检查项 + model.setQtfz(checkModel.getQtfz()); + model.setBuildId(checkModel.getBuildId()); model.setYlSelect(checkModel.getYlSelect()); model.setMainFoster(checkModel.getMainFoster()); @@ -1046,7 +1235,6 @@ public class BabyCheckFacade { model.setHomeMeasure(checkModel.getHomeMeasure()); model.setMorbidity(checkModel.getMorbidity()); - model.setTemperature(checkModel.getTemperature()); model.setHeight(checkModel.getHeight()); model.setWeight(checkModel.getWeight()); @@ -1351,6 +1539,18 @@ public class BabyCheckFacade { List qbType = QbTypeEnums.getQbTypeEnums(); map.put("qbType", qbType); + //月龄套餐 + List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class); + map.put("jctc", jctc); + + //月龄套餐 + List cnqk = EnumUtil.toJson(ChildCareEnums.CNQKEnums.class); + map.put("cnqk", cnqk); + + //月龄套餐 + List ycp = EnumUtil.toJson(ChildCareEnums.YDCPEnums.class); + map.put("ycp", ycp); + map.put("initCheckDate", DateUtil.getyyyy_MM_dd(new Date())); map.put("organizations", antenatalExaminationFacade.convert()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java index 7eebefe..1e41de9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java @@ -75,7 +75,7 @@ public class TrackDownJobFacade { interface TrackDownDataLoader { //分页的条数 - int limit = 10000; + int limit = 1000; /** * 执行处理方法 @@ -111,15 +111,15 @@ public class TrackDownJobFacade { @PostConstruct private void init() { //婚前检查数据加载 - // downJobHandlers.add(new HJTrackDownDataLoader()); + downJobHandlers.add(new HJTrackDownDataLoader()); //怀孕建档数据加载 - // downJobHandlers.add(new HYTrackDownDataLoader()); + downJobHandlers.add(new HYTrackDownDataLoader()); //产检数据加载 downJobHandlers.add(new CJTrackDownDataLoader()); //分娩数据加载，有自动任务处理 // downJobHandlers.add(new FMTrackDownDataLoader()); //产后访视和产后复查的数据加载 产后访视和产后复查的规则一样 - // downJobHandlers.add(new CHTrackDownDataLoader()); + downJobHandlers.add(new CHTrackDownDataLoader()); } @@ -182,8 +182,9 @@ public class TrackDownJobFacade { TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(model.getId()); List records = trackDownRecordService.queryTrackDown(downRecordQuery); - if (CollectionUtils.isNotEmpty(records)) {//存在则跳过 - return; + if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改 + TrackDownRecord trackDownRecord1 = records.get(0); + trackDownRecord.setId(trackDownRecord1.getId()); } else {//不存在则查询继续查追访记录，可能来至妇女建档追访数据 downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setHospitalId(model.getHospitalId()); @@ -198,9 +199,15 @@ public class TrackDownJobFacade { trackDownRecord.setId(trackDownRecord1.getId()); } } + int week = DateUtil.getWeek2(model.getLastMenses(), new Date()); if (week > 20) {//不能做产前筛查追访，显示产前检查追访 + if(trackDownRecord.getTrackType() == TrackDownDateEnums.I.getId()){ + return; + } trackDownRecord.setTrackType(TrackDownDateEnums.I.getId()); + }else{ + return; } trackDownService.addOrupdateTrackDownRecord(model.getOperator(), trackDownRecord); }catch (Exception e){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index bff9db2..f33ed47 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -3166,9 +3166,112 @@ public class ViewFacade { } } - - model.setId(checkModel.getId()); - + //新加字段 + model.setTcType(checkModel.getTcType()); + + + + model.setCnqk(checkModel.getCnqk()); + model.setMtcnNum( UnitUtils.unitSplice(checkModel.getMtcnNum(), UnitConstants.CI)); + model.setXbNum(UnitUtils.unitSplice(checkModel.getXbNum(), UnitConstants.CI)); + model.setDbNum( UnitUtils.unitSplice(checkModel.getDbNum(), UnitConstants.CI)); + model.setQdtlTime(checkModel.getQdtlTime()); + model.setPfhrTime(checkModel.getPfhrTime()); + model.setWssAd(checkModel.getWssAd()); + model.setDouhbqk(checkModel.getDouhbqk()); + model.setKq(checkModel.getKq()); + + model.setCyNum(UnitUtils.unitSplice(checkModel.getCyNum(), UnitConstants.KE)); + model.setQcNum(UnitUtils.unitSplice(checkModel.getQcNum(), UnitConstants.KE)); + model.setBtt(checkModel.getBtt()); + model.setXf(checkModel.getXf()); + model.setXlClass(checkModel.getXlClass()); + model.setXldq(checkModel.getXldq()); + model.setNd(UnitUtils.unitSplice(checkModel.getNd(), UnitConstants.GG)); + + + + model.setYgbmky(FunvCommonUtil.checkYiGan(checkModel.getYgbmky())); + model.setYgeky(FunvCommonUtil.checkYiGan(checkModel.getYgeky())); + model.setYgekt(FunvCommonUtil.checkYiGan(checkModel.getYgekt())); + model.setYghxkt(FunvCommonUtil.checkYiGan(checkModel.getYghxkt())); + + model.setWlTong(UnitUtils.unitSplice(checkModel.getWlTong(), UnitConstants.UMOLL)); + model.setWlXin(UnitUtils.unitSplice(checkModel.getWlXin(), UnitConstants.UMOLL)); + model.setWlGai(UnitUtils.unitSplice(checkModel.getWlGai(), UnitConstants.UMOLL)); + model.setWlMei(UnitUtils.unitSplice(checkModel.getWlMei(), UnitConstants.UMOLL)); + model.setWlTie(UnitUtils.unitSplice(checkModel.getWlTie(), UnitConstants.UMOLL)); + model.setWlQian(UnitUtils.unitSplice(checkModel.getWlQian(), UnitConstants.UMOLL)); + model.setWlGe(UnitUtils.unitSplice(checkModel.getWlGe(), UnitConstants.UMOLL)); + model.setWlMeng(UnitUtils.unitSplice(checkModel.getWlMeng(), UnitConstants.UMOLL)); + model.setYgbmkyNum(checkModel.getYgbmkyNum()); + model.setYgbmktNum(checkModel.getYgbmktNum()); + model.setYgekyNum(checkModel.getYgekyNum()); + model.setYgektNum(checkModel.getYgektNum()); + model.setYghxktNum(checkModel.getYghxktNum()); + + model.setXqgbzam(UnitUtils.unitSplice(checkModel.getXqgbzam(), UnitConstants.UL)); + model.setXqgczam( UnitUtils.unitSplice(checkModel.getXqgczam(), UnitConstants.UL)); + model.setAlbumin(UnitUtils.unitSplice(checkModel.getAlbumin(), UnitConstants.UL)); + model.setTotalBilirubin( UnitUtils.unitSplice(checkModel.getTotalBilirubin(), UnitConstants.UL)); + model.setJhBilirubin(UnitUtils.unitSplice(checkModel.getJhBilirubin(), UnitConstants.UL)); + + model.setBcgYs(checkModel.getBcgYs()); + model.setBcgXz(checkModel.getBcgXz()); + model.setBcgHbx(FunvCommonUtil.checkYiGan(checkModel.getBcgHbx())); + + model.setBcgBxb(FunvCommonUtil.checkYiGan(checkModel.getBcgBxb())); + model.setBcgSpxb(FunvCommonUtil.checkYiGan(checkModel.getBcgSpxb())); + //肿瘤细胞 + model.setBcgZlxb(FunvCommonUtil.checkYiGan(checkModel.getBcgZlxb())); + //淀粉颗粒 + model.setBcgDfkl(FunvCommonUtil.checkYiGan(checkModel.getBcgDfkl())); + //脂肪颗粒 + model.setBcgZfkl(FunvCommonUtil.checkYiGan(checkModel.getBcgZfkl())); + //肌纤维 + model.setBcgJxw(FunvCommonUtil.checkYiGan(checkModel.getBcgJxw())); + //植物纤维 + model.setBcgZwxw(FunvCommonUtil.checkYiGan(checkModel.getBcgZwxw())); + //致病菌 + model.setBcgZbj(FunvCommonUtil.checkYiGan(checkModel.getBcgZbj())); + //真菌 + model.setBcgZj(FunvCommonUtil.checkYiGan(checkModel.getBcgZj())); + //寄生虫 + model.setBcgJsc(FunvCommonUtil.checkYiGan(checkModel.getBcgJsc())); + //原虫 + model.setBcgYc(FunvCommonUtil.checkYiGan(checkModel.getBcgYc())); + //气味 + model.setBcgQw(checkModel.getBcgQw()); + /*****便常规***/ + + //维生素A + model.setWssa(UnitUtils.unitSplice(checkModel.getWssa(), UnitConstants.NG)); + //维生素D + model.setJcwd(UnitUtils.unitSplice(checkModel.getJcwd(), UnitConstants.NG)); + //维生素E + model.setWsse(UnitUtils.unitSplice(checkModel.getWsse(), UnitConstants.NG)); + //乳汁分析 + model.setRzfx(checkModel.getRzfx()); + //M-CHAT筛查 + model.setChatSc(checkModel.getChatSc()); + //儿童早期语言发育测评 + model.setYyfyTest(checkModel.getYyfyTest()); + //智力测评 + model.setZlcp(checkModel.getZlcp()); + //孤独症筛查 + model.setGdzsc(checkModel.getGdzsc()); + //膳食分析 + model.setSsfx(checkModel.getSsfx()); + //感觉统合能力检查 + model.setGjzh(checkModel.getGjzh()); + //入学能力检查 + model.setRxnl(checkModel.getRxnl()); + //先心病筛查 + model.setXxbsc(checkModel.getXxbsc()); + //智力筛查（DDST） + model.setZlsc(checkModel.getZlsc()); + //其他及系统现有的辅助检查项 + model.setQtfz(checkModel.getQtfz()); model.setBuildId(checkModel.getBuildId()); model.setMainFoster(StringUtils.isNotEmpty(checkModel.getMainFoster()) ? FyTypeEnums.getNameById(Integer.valueOf(checkModel.getMainFoster())) : ""); model.setFeedType(StringUtils.isNotEmpty(checkModel.getFeedType()) ? WyTypeEnums.getNameById(Integer.valueOf(checkModel.getFeedType())) : ""); @@ -3325,7 +3428,6 @@ public class ViewFacade { drugGllergic = "无"; } else if ("yes".equals(yesOrNo)) { - String qmsgm = map.get("qmsgm") == null ? "" : map.get("qmsgm").toString(); if ("true".equals(qmsgm)) { drugGllergic += " 青霉素过敏,"; @@ -3342,7 +3444,7 @@ public class ViewFacade { String qt = map.get("qt") == null ? "" : map.get("qt").toString(); if ("true".equals(qt)) { String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString(); - drugGllergic += " " + qtText; + drugGllergic += " " + qtText+","; } drugGllergic = FunvCommonUtil.spitd(drugGllergic); } @@ -3363,17 +3465,17 @@ public class ViewFacade { model.setBabyCheckOther(checkModel.getBabyCheckOther()); model.setAssistCheckOther(checkModel.getAssistCheckOther()); - if (checkModel.getNavel() != null && checkModel.getNavel().size() > 0) { - Map map = checkModel.getNavel(); - if ("4".equals(map.get("select").toString())) { - model.setNavel(map.get("other")); - } else { - String value = QbTypeEnums.getNameById(Integer.parseInt(map.get("select").toString())); - model.setNavel(value); - } - - } - + model.setNavel(checkModel.getNavel()); + // if (checkModel.getNavel() != null && checkModel.getNavel().size() > 0) { + // Map map = checkModel.getNavel(); + // if ("4".equals(map.get("select").toString())) { + // model.setNavel(checkModel.getNavel()); + // } else { + // String value = QbTypeEnums.getNameById(Integer.parseInt(map.get("select").toString())); + // model.setNavel(value); + // } + // + // } return model; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 688bdd7..9577087 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -12,258 +12,947 @@ import java.util.Map; */ public class BabyCheckRequest { - - /** 优惠券 */ - private String hemoglobinCoupon; - - private String id; - - private String pid; - - public String getPid() { - return pid; - } - - public void setPid(String pid) { - this.pid = pid; - } - //建档ID @FormParam @NotEmpty(message = "建档ID不能为空.") private String buildId; + private String id; + private String pid; + // 检查套餐 + private Integer tcType; /******问诊情况****/ - //主要抚养人 private String mainFoster; - //喂养方式 private String feedType; - //小便 private String pee; - //大便 private String excrement; - //睡眠情况 private String sleep; - //活动小时 private String activity; - //维生素D private String vitaminD; - - //辅食 - private String assistFood; - + //辅食（新版修改为选择项） + private Map assistFood; //家庭措施 private String homeMeasure; - //发病情况 private String morbidity; - //药物过敏史 - private Map drugGllergic; - + private Map drugGllergic; + //问诊其他 + private String askOther; /******问诊情况****/ + /******新加问诊情况****/ + //吃奶情况 + private String cnqk; + //每天吃奶次数 + private String mtcnNum; + //小便次数 + private String xbNum; + //大便次数 + private String dbNum; + //脐带脱落的时间 + private String qdtlTime; + //皮肤黄染消退的时间 + private String pfhrTime; + //维生素AD + private String wssAd; + //两次随访间患病情况 + private Map douhbqk; + /******新加问诊情况****/ /******一般检查****/ - - //体温 private String temperature; - //体重 private String weight; //身长 private String height; //头围 private String head; - //体重评价 private String weightEvaluate; //身长评价 private String heightEvaluate; //头围评价 private String headEvaluate; - //胸围 private String chestw; - //身长别体重 private String heightWeight; - //月龄下拉框 + //预约儿保月龄下拉框 private String ylSelect; - - public String getYlSelect() { - return ylSelect; - } - - public void setYlSelect(String ylSelect) { - this.ylSelect = ylSelect; - } - - //发育评价 + //体格发育评价 private List growthEvaluate; - + //前囟{闭合、未闭合、未闭合尺寸x-y} + private Map bregma; /******一般检查****/ - /******儿科检查****/ + /******儿科检查****/ //胆红素 头 private String bilirubinHead; - //胆红素 胸 private String bilirubinChest; - //胆红素 腹 private String bilirubinBelly; - - //前囟 - private Map bregma; - - //牙齿 private String tooth; - - //面色 - private String faceColor; - - - //皮肤 - private String skin; - - //yan眼外观 + //面色（新版修改为选择项） + private Map faceColor; + //皮肤（新版修改为选择项） + private Map skin; + //眼外观 private String eye; - //视力 private String eyesight; - //耳外观 private String ear; - - //听力 - private String hearing; - - //颈部 - private String neck; - - //胸部 - private String chest; - + //听力筛查（新版修改为选择项） + private Map hearing; + //颈部（新版修改为选择项） + private Map neck; + //胸部（新版修改为选择项） + private Map chest; //腹部 private String belly; - //脊柱四肢 private String spineFours; - - //肝门/生殖器 - private String portaGenitals; - - //步胎 + //肛门/生殖器 + private Map portaGenitals; + //步态 private String stepStatus; - - //佝偻病状 - private String stoopStatus; - - //佝偻体征 - private String stoopSign; - - //神经 + //佝偻病症状（新版修改为选择项） + private Map stoopStatus; + //佝偻体征（新版修改为选择项） + private Map stoopSign; + //神经系统检查 private String nerve; - + //儿科检查其他 + private String babyCheckOther; + //脐部 + private Map navel; /******儿科检查****/ + /******新增儿科检查****/ + //口腔 + private String kq; + // 出牙数 + private String cyNum; + //龋齿 + private String qcNum; + //咽/扁桃体 + private String btt; + //心肺 + private String xf; + /******新增儿科检查****/ /******辅助检查****/ - //骨密度z值 private String bonez; - - //髋关节 - private String hipJoint; - - //血红蛋白 + //髋关节(新版修改为选择) + private Map hipJoint; + //运动测评 + private String sportsEvaluation; + //心理行为测评 + private String heartAction; + //血常规：血红蛋白 private String hemoglobin; - - //白细胞 + //血常规：血红蛋白券 + private String hemoglobinCoupon; + //血常规：白细胞计数 private String whiteCell; - - //血小板 + //血常规：血小板计数 private String platelet; - //血常规其他 private String otherBlood; - //尿蛋白 + //尿常规：尿蛋白 private String urineProtein; - - //尿糖 + //尿常规：尿糖 private String urineSugar; - - //尿酮体 + //尿常规：尿酮体 private String urineAcetone; - - //尿潜血 + //尿常规：尿潜血 private String hematuria; - - //尿其他 + //尿常规：尿其他 private String otherUrine; - + //辅助检查其他 + private String assistCheckOther; /******辅助检查****/ - /******诊断指导****/ + /******新增辅助检查开始****/ + /**心理行为发育测评**/ + // CIASS筛查 + private Map xlClass; + // dq + private String xldq; + /**心理行为发育测评**/ + //尿碘 + private String nd; + /*****乙肝五项***/ + // 乙肝表面抗原 + private String ygbmky; + //乙肝表面抗体 + private String ygbmkt; + //乙肝e抗原 + private String ygeky; + // 乙肝e抗体 + private String ygekt; + // 乙肝核心抗体 + private String yghxkt; + //铜 + private String wlTong; + //锌 + private String wlXin; + //钙 + private String wlGai; + //镁 + private String wlMei; + //铁 + private String wlTie; + //铅 + private String wlQian; + //镉 + private String wlGe; + //锰 + private String wlMeng; + /*****乙肝五项***/ + + /*****乙肝五项定量***/ + // 乙肝表面抗原 + private String ygbmkyNum; + //乙肝表面抗体 + private String ygbmktNum; + //乙肝e抗原 + private String ygekyNum; + // 乙肝e抗体 + private String ygektNum; + // 乙肝核心抗体 + private String yghxktNum; + /*****乙肝五项定量***/ + + /*****肝功能***/ + //血清谷丙转氨酶 + private String xqgbzam; + //血清谷草转氨酶 + private String xqgczam; + //白蛋白 + private String albumin; + //总胆红素 + private String totalBilirubin; + //结合胆红素 + private String jhBilirubin; + /*****肝功能***/ + + /*****便常规***/ + //颜色 + private String bcgYs; + //性状 + private String bcgXz; + //红细胞 + private String bcgHbx; + //白细胞 + private String bcgBxb; + //上皮细胞 + private String bcgSpxb; + //肿瘤细胞 + private String bcgZlxb; + //淀粉颗粒 + private String bcgDfkl; + //脂肪颗粒 + private String bcgZfkl; + //肌纤维 + private String bcgJxw; + //植物纤维 + private String bcgZwxw; + //致病菌 + private String bcgZbj; + //真菌 + private String bcgZj; + //寄生虫 + private String bcgJsc; + //原虫 + private String bcgYc; + //气味 + private String bcgQw; + /*****便常规***/ + //维生素A + private String wssa; + //维生素D + private String jcwd; + //维生素E + private String wsse; + //乳汁分析 + private Map rzfx; + //M-CHAT筛查 + private Map chatSc; + //儿童早期语言发育测评 + private Map yyfyTest; + //智力测评 + private String zlcp; + //孤独症筛查 + private String gdzsc; + //膳食分析 + private String ssfx; + //感觉统合能力检查 + private String gjzh; + //入学能力检查 + private String rxnl; + //先心病筛查 + private String xxbsc; + //智力筛查（DDST） + private String zlsc; + //其他及系统现有的辅助检查项 + private String qtfz; + /******新增辅助检查结束****/ + /******诊断指导****/ //诊断 private List diagnose; - //处理意见 private String handlSuggest; - //指导意见 private String guideSuggest; - //产检医生 @FormParam @NotEmpty(message = "检查医生不能为空") private String checkDoctor; - - //下次预约 + //下次预约时间 private String nextDate; - //是否高危儿童 0 非高危 1高危 private Integer highRisk; - //建档ID + /******诊断指导****/ + @FormParam @NotEmpty(message = "检查日期不能为空") private String checkDate; - + //月龄 private String monthAge; - + //产检卷 private String couponCode; - + //使用状态 private Integer couponType; - //运动测评 - private String sportsEvaluation; + public String getWlTong() { + return wlTong; + } - //心理行为 - private String heartAction; + public Map getAssistFood() { + return assistFood; + } + public void setAssistFood(Map assistFood) { + this.assistFood = assistFood; + } - //问诊其他 - private String askOther; + public String getCyNum() { + return cyNum; + } - //儿科检查其他 - private String babyCheckOther; + public void setCyNum(String cyNum) { + this.cyNum = cyNum; + } - //辅助检查其他 - private String assistCheckOther; + public String getQcNum() { + return qcNum; + } - //脐部 - private Map navel; + public void setQcNum(String qcNum) { + this.qcNum = qcNum; + } + + public void setWlTong(String wlTong) { + this.wlTong = wlTong; + } + + public String getWlXin() { + return wlXin; + } + + public void setWlXin(String wlXin) { + this.wlXin = wlXin; + } + + public String getWlGai() { + return wlGai; + } + + public void setWlGai(String wlGai) { + this.wlGai = wlGai; + } + + public String getWlMei() { + return wlMei; + } + + public void setWlMei(String wlMei) { + this.wlMei = wlMei; + } + + public String getWlTie() { + return wlTie; + } + + public void setWlTie(String wlTie) { + this.wlTie = wlTie; + } + + public String getWlQian() { + return wlQian; + } + + public void setWlQian(String wlQian) { + this.wlQian = wlQian; + } + + public String getWlGe() { + return wlGe; + } + + public void setWlGe(String wlGe) { + this.wlGe = wlGe; + } + + public String getWlMeng() { + return wlMeng; + } + + public void setWlMeng(String wlMeng) { + this.wlMeng = wlMeng; + } + + public String getYgbmkyNum() { + return ygbmkyNum; + } + + public void setYgbmkyNum(String ygbmkyNum) { + this.ygbmkyNum = ygbmkyNum; + } + + public String getYgbmktNum() { + return ygbmktNum; + } + + public void setYgbmktNum(String ygbmktNum) { + this.ygbmktNum = ygbmktNum; + } + + public String getYgekyNum() { + return ygekyNum; + } + + public void setYgekyNum(String ygekyNum) { + this.ygekyNum = ygekyNum; + } + + public String getYgektNum() { + return ygektNum; + } + + public void setYgektNum(String ygektNum) { + this.ygektNum = ygektNum; + } + + public String getYghxktNum() { + return yghxktNum; + } + + public void setYghxktNum(String yghxktNum) { + this.yghxktNum = yghxktNum; + } + + public String getBcgYs() { + return bcgYs; + } + + public void setBcgYs(String bcgYs) { + this.bcgYs = bcgYs; + } + + public String getBcgXz() { + return bcgXz; + } + + public void setBcgXz(String bcgXz) { + this.bcgXz = bcgXz; + } + + public String getBcgHbx() { + return bcgHbx; + } + + public void setBcgHbx(String bcgHbx) { + this.bcgHbx = bcgHbx; + } + + public String getBcgBxb() { + return bcgBxb; + } + + public void setBcgBxb(String bcgBxb) { + this.bcgBxb = bcgBxb; + } + + public String getBcgSpxb() { + return bcgSpxb; + } + + public void setBcgSpxb(String bcgSpxb) { + this.bcgSpxb = bcgSpxb; + } + + public String getBcgZlxb() { + return bcgZlxb; + } + + public void setBcgZlxb(String bcgZlxb) { + this.bcgZlxb = bcgZlxb; + } + + public String getBcgDfkl() { + return bcgDfkl; + } + + public void setBcgDfkl(String bcgDfkl) { + this.bcgDfkl = bcgDfkl; + } + + public String getBcgZfkl() { + return bcgZfkl; + } + + public void setBcgZfkl(String bcgZfkl) { + this.bcgZfkl = bcgZfkl; + } + + public String getBcgJxw() { + return bcgJxw; + } + + public void setBcgJxw(String bcgJxw) { + this.bcgJxw = bcgJxw; + } + + public String getBcgZwxw() { + return bcgZwxw; + } + + public void setBcgZwxw(String bcgZwxw) { + this.bcgZwxw = bcgZwxw; + } + + public String getBcgZbj() { + return bcgZbj; + } + + public void setBcgZbj(String bcgZbj) { + this.bcgZbj = bcgZbj; + } + + public String getBcgZj() { + return bcgZj; + } + + public void setBcgZj(String bcgZj) { + this.bcgZj = bcgZj; + } + + public String getBcgJsc() { + return bcgJsc; + } + + public void setBcgJsc(String bcgJsc) { + this.bcgJsc = bcgJsc; + } + + public String getBcgYc() { + return bcgYc; + } + + public void setBcgYc(String bcgYc) { + this.bcgYc = bcgYc; + } + + public String getBcgQw() { + return bcgQw; + } + + public void setBcgQw(String bcgQw) { + this.bcgQw = bcgQw; + } + + public Integer getTcType() { + return tcType; + } + + public void setTcType(Integer tcType) { + this.tcType = tcType; + } + + public String getCnqk() { + return cnqk; + } + + public void setCnqk(String cnqk) { + this.cnqk = cnqk; + } + + public String getMtcnNum() { + return mtcnNum; + } + + public void setMtcnNum(String mtcnNum) { + this.mtcnNum = mtcnNum; + } + + public String getXbNum() { + return xbNum; + } + + public void setXbNum(String xbNum) { + this.xbNum = xbNum; + } + + public String getDbNum() { + return dbNum; + } + + public void setDbNum(String dbNum) { + this.dbNum = dbNum; + } + + public String getQdtlTime() { + return qdtlTime; + } + + public void setQdtlTime(String qdtlTime) { + this.qdtlTime = qdtlTime; + } + + public String getPfhrTime() { + return pfhrTime; + } + + public void setPfhrTime(String pfhrTime) { + this.pfhrTime = pfhrTime; + } + + public String getWssAd() { + return wssAd; + } + + public void setWssAd(String wssAd) { + this.wssAd = wssAd; + } + + public Map getDouhbqk() { + return douhbqk; + } + + public void setDouhbqk(Map douhbqk) { + this.douhbqk = douhbqk; + } + + public Map getFaceColor() { + return faceColor; + } + + public void setFaceColor(Map faceColor) { + this.faceColor = faceColor; + } + + public Map getSkin() { + return skin; + } + + public void setSkin(Map skin) { + this.skin = skin; + } + + public Map getHearing() { + return hearing; + } + + public void setHearing(Map hearing) { + this.hearing = hearing; + } + + public Map getNeck() { + return neck; + } + + public void setNeck(Map neck) { + this.neck = neck; + } + + public Map getPortaGenitals() { + return portaGenitals; + } + + public void setPortaGenitals(Map portaGenitals) { + this.portaGenitals = portaGenitals; + } + + public String getKq() { + return kq; + } + + public void setKq(String kq) { + this.kq = kq; + } + + public String getBtt() { + return btt; + } + + public void setBtt(String btt) { + this.btt = btt; + } + + public String getXf() { + return xf; + } + + public void setXf(String xf) { + this.xf = xf; + } + + public Map getHipJoint() { + return hipJoint; + } + + public void setHipJoint(Map hipJoint) { + this.hipJoint = hipJoint; + } + + public Map getXlClass() { + return xlClass; + } + + public void setXlClass(Map xlClass) { + this.xlClass = xlClass; + } + + public String getXldq() { + return xldq; + } + + public void setXldq(String xldq) { + this.xldq = xldq; + } + + public String getNd() { + return nd; + } + + public void setNd(String nd) { + this.nd = nd; + } + + public String getYgbmky() { + return ygbmky; + } + + public void setYgbmky(String ygbmky) { + this.ygbmky = ygbmky; + } + + public String getYgbmkt() { + return ygbmkt; + } + + public void setYgbmkt(String ygbmkt) { + this.ygbmkt = ygbmkt; + } + + public String getYgeky() { + return ygeky; + } + + public void setYgeky(String ygeky) { + this.ygeky = ygeky; + } + + public String getYgekt() { + return ygekt; + } + + public void setYgekt(String ygekt) { + this.ygekt = ygekt; + } + + public String getYghxkt() { + return yghxkt; + } + + public void setYghxkt(String yghxkt) { + this.yghxkt = yghxkt; + } + + public String getXqgbzam() { + return xqgbzam; + } + + public void setXqgbzam(String xqgbzam) { + this.xqgbzam = xqgbzam; + } + + public String getXqgczam() { + return xqgczam; + } + + public void setXqgczam(String xqgczam) { + this.xqgczam = xqgczam; + } + + public String getAlbumin() { + return albumin; + } + + public void setAlbumin(String albumin) { + this.albumin = albumin; + } + + public String getTotalBilirubin() { + return totalBilirubin; + } + + public void setTotalBilirubin(String totalBilirubin) { + this.totalBilirubin = totalBilirubin; + } + + public String getJhBilirubin() { + return jhBilirubin; + } + + public void setJhBilirubin(String jhBilirubin) { + this.jhBilirubin = jhBilirubin; + } + + public String getWssa() { + return wssa; + } + + public void setWssa(String wssa) { + this.wssa = wssa; + } + + public String getJcwd() { + return jcwd; + } + + public void setJcwd(String jcwd) { + this.jcwd = jcwd; + } + + public String getWsse() { + return wsse; + } + + public void setWsse(String wsse) { + this.wsse = wsse; + } + + public Map getRzfx() { + return rzfx; + } + + public void setRzfx(Map rzfx) { + this.rzfx = rzfx; + } + + public Map getChatSc() { + return chatSc; + } + + public void setChatSc(Map chatSc) { + this.chatSc = chatSc; + } + + public Map getYyfyTest() { + return yyfyTest; + } + + public void setYyfyTest(Map yyfyTest) { + this.yyfyTest = yyfyTest; + } + + public String getZlcp() { + return zlcp; + } + + public void setZlcp(String zlcp) { + this.zlcp = zlcp; + } + + public String getGdzsc() { + return gdzsc; + } + + public void setGdzsc(String gdzsc) { + this.gdzsc = gdzsc; + } + + public String getSsfx() { + return ssfx; + } + + public void setSsfx(String ssfx) { + this.ssfx = ssfx; + } + + public String getGjzh() { + return gjzh; + } + + public void setGjzh(String gjzh) { + this.gjzh = gjzh; + } + + public String getRxnl() { + return rxnl; + } + + public void setRxnl(String rxnl) { + this.rxnl = rxnl; + } + + public String getXxbsc() { + return xxbsc; + } + + public void setXxbsc(String xxbsc) { + this.xxbsc = xxbsc; + } + + public String getZlsc() { + return zlsc; + } + + public void setZlsc(String zlsc) { + this.zlsc = zlsc; + } + + public String getQtfz() { + return qtfz; + } + + public void setQtfz(String qtfz) { + this.qtfz = qtfz; + } + + public String getYlSelect() { + return ylSelect; + } + + public void setYlSelect(String ylSelect) { + this.ylSelect = ylSelect; + } public String getHemoglobinCoupon() { return hemoglobinCoupon; @@ -385,8 +1074,13 @@ public class BabyCheckRequest { this.chestw = chestw; } - /******诊断指导****/ + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } public String getId() { @@ -453,14 +1147,6 @@ public class BabyCheckRequest { this.vitaminD = vitaminD; } - public String getAssistFood() { - return assistFood; - } - - public void setAssistFood(String assistFood) { - this.assistFood = assistFood; - } - public String getHomeMeasure() { return homeMeasure; } @@ -517,14 +1203,10 @@ public class BabyCheckRequest { this.heightWeight = heightWeight; } - public String getChest() { + public Map getChest() { return chest; } - public void setChest(String chest) { - this.chest = chest; - } - public List getGrowthEvaluate() { return growthEvaluate; } @@ -621,22 +1303,6 @@ public class BabyCheckRequest { this.tooth = tooth; } - public String getFaceColor() { - return faceColor; - } - - public void setFaceColor(String faceColor) { - this.faceColor = faceColor; - } - - public String getSkin() { - return skin; - } - - public void setSkin(String skin) { - this.skin = skin; - } - public String getEye() { return eye; } @@ -661,22 +1327,6 @@ public class BabyCheckRequest { this.ear = ear; } - public String getHearing() { - return hearing; - } - - public void setHearing(String hearing) { - this.hearing = hearing; - } - - public String getNeck() { - return neck; - } - - public void setNeck(String neck) { - this.neck = neck; - } - public String getBelly() { return belly; } @@ -693,14 +1343,6 @@ public class BabyCheckRequest { this.spineFours = spineFours; } - public String getPortaGenitals() { - return portaGenitals; - } - - public void setPortaGenitals(String portaGenitals) { - this.portaGenitals = portaGenitals; - } - public String getStepStatus() { return stepStatus; } @@ -709,19 +1351,23 @@ public class BabyCheckRequest { this.stepStatus = stepStatus; } - public String getStoopStatus() { + public void setChest(Map chest) { + this.chest = chest; + } + + public Map getStoopStatus() { return stoopStatus; } - public void setStoopStatus(String stoopStatus) { + public void setStoopStatus(Map stoopStatus) { this.stoopStatus = stoopStatus; } - public String getStoopSign() { + public Map getStoopSign() { return stoopSign; } - public void setStoopSign(String stoopSign) { + public void setStoopSign(Map stoopSign) { this.stoopSign = stoopSign; } @@ -741,14 +1387,6 @@ public class BabyCheckRequest { this.bonez = bonez; } - public String getHipJoint() { - return hipJoint; - } - - public void setHipJoint(String hipJoint) { - this.hipJoint = hipJoint; - } - public String getHemoglobin() { return hemoglobin; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index 96cd3ef..5fae9ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -1,11 +1,16 @@ package com.lyms.platform.operate.web.result; +import java.util.Map; + /** * Created by Administrator on 2016/6/21. */ public class BabyCheckPageResult { + // 检查套餐 + private Integer tcType; + private String hemoglobinCoupon; private String id; @@ -259,10 +264,730 @@ public class BabyCheckPageResult { private String assistCheckOther; //脐部 - private String navel; + private Map navel; private String couponCode; + + /******新加问诊情况****/ + //吃奶情况 + public String cnqk; + //每天吃奶次数 + public String mtcnNum; + //辅食添加 + public Map fstj; + //小便次数 + public String xbNum; + //大便次数 + public String dbNum; + //脐带脱落的时间 + public String qdtlTime; + //皮肤黄染消退的时间 + public String pfhrTime; + //维生素AD + public String wssAd; + //两次随访间患病情况 + public Map douhbqk; + /******新加问诊情况****/ + + /******新增儿科检查****/ + //口腔 + public String kq; + // 出牙数 + public String cyNum; + //龋齿 + public String qcNum; + //咽/扁桃体 + public String btt; + //心肺 + public String xf; + /******新增儿科检查****/ + + /******新增辅助检查开始****/ + /**心理行为发育测评**/ + // CIASS筛查 + private Map xlClass; + // dq + private String xldq; + /**心理行为发育测评**/ + //尿碘 + public String nd; + /*****乙肝五项***/ + // 乙肝表面抗原 + private String ygbmky; + //乙肝表面抗体 + private String ygbmkt; + //乙肝e抗原 + private String ygeky; + // 乙肝e抗体 + private String ygekt; + // 乙肝核心抗体 + private String yghxkt; + //铜 + private String wlTong; + //锌 + private String wlXin; + //钙 + private String wlGai; + //镁 + private String wlMei; + //铁 + private String wlTie; + //铅 + private String wlQian; + //镉 + private String wlGe; + //锰 + private String wlMeng; + /*****乙肝五项***/ + + /*****乙肝五项定量***/ + // 乙肝表面抗原 + private String ygbmkyNum; + //乙肝表面抗体 + private String ygbmktNum; + //乙肝e抗原 + private String ygekyNum; + // 乙肝e抗体 + private String ygektNum; + // 乙肝核心抗体 + private String yghxktNum; + /*****乙肝五项定量***/ + + /*****肝功能***/ + //血清谷丙转氨酶 + private String xqgbzam; + //血清谷草转氨酶 + private String xqgczam; + //白蛋白 + private String albumin; + //总胆红素 + private String totalBilirubin; + //结合胆红素 + private String jhBilirubin; + /*****肝功能***/ + + /*****便常规***/ + //颜色 + private String bcgYs; + //性状 + private String bcgXz; + //红细胞 + private String bcgHbx; + //白细胞 + private String bcgBxb; + //上皮细胞 + private String bcgSpxb; + //肿瘤细胞 + private String bcgZlxb; + //淀粉颗粒 + private String bcgDfkl; + //脂肪颗粒 + private String bcgZfkl; + //肌纤维 + private String bcgJxw; + //植物纤维 + private String bcgZwxw; + //致病菌 + private String bcgZbj; + //真菌 + private String bcgZj; + //寄生虫 + private String bcgJsc; + //原虫 + private String bcgYc; + //气味 + private String bcgQw; + /*****便常规***/ + //维生素A + private String wssa; + //维生素D + private String jcwd; + //维生素E + private String wsse; + //乳汁分析 + private Map rzfx; + //M-CHAT筛查 + private Map chatSc; + //儿童早期语言发育测评 + private Map yyfyTest; + //智力测评 + private String zlcp; + //孤独症筛查 + private String gdzsc; + //膳食分析 + private String ssfx; + //感觉统合能力检查 + private String gjzh; + //入学能力检查 + private String rxnl; + //先心病筛查 + private String xxbsc; + //智力筛查（DDST） + private String zlsc; + //其他及系统现有的辅助检查项 + private String qtfz; + + public String getCnqk() { + return cnqk; + } + + public void setCnqk(String cnqk) { + this.cnqk = cnqk; + } + + public String getMtcnNum() { + return mtcnNum; + } + + public void setMtcnNum(String mtcnNum) { + this.mtcnNum = mtcnNum; + } + + public Map getFstj() { + return fstj; + } + + public void setFstj(Map fstj) { + this.fstj = fstj; + } + + public String getXbNum() { + return xbNum; + } + + public void setXbNum(String xbNum) { + this.xbNum = xbNum; + } + + public String getDbNum() { + return dbNum; + } + + public void setDbNum(String dbNum) { + this.dbNum = dbNum; + } + + public String getQdtlTime() { + return qdtlTime; + } + + public void setQdtlTime(String qdtlTime) { + this.qdtlTime = qdtlTime; + } + + public String getPfhrTime() { + return pfhrTime; + } + + public void setPfhrTime(String pfhrTime) { + this.pfhrTime = pfhrTime; + } + + public String getWssAd() { + return wssAd; + } + + public void setWssAd(String wssAd) { + this.wssAd = wssAd; + } + + public Map getDouhbqk() { + return douhbqk; + } + + public void setDouhbqk(Map douhbqk) { + this.douhbqk = douhbqk; + } + + public String getKq() { + return kq; + } + + public void setKq(String kq) { + this.kq = kq; + } + + public String getCyNum() { + return cyNum; + } + + public void setCyNum(String cyNum) { + this.cyNum = cyNum; + } + + public String getQcNum() { + return qcNum; + } + + public void setQcNum(String qcNum) { + this.qcNum = qcNum; + } + + public String getBtt() { + return btt; + } + + public void setBtt(String btt) { + this.btt = btt; + } + + public String getXf() { + return xf; + } + + public void setXf(String xf) { + this.xf = xf; + } + + public Map getXlClass() { + return xlClass; + } + + public void setXlClass(Map xlClass) { + this.xlClass = xlClass; + } + + public String getXldq() { + return xldq; + } + + public void setXldq(String xldq) { + this.xldq = xldq; + } + + public String getNd() { + return nd; + } + + public void setNd(String nd) { + this.nd = nd; + } + + public String getYgbmky() { + return ygbmky; + } + + public void setYgbmky(String ygbmky) { + this.ygbmky = ygbmky; + } + + public String getYgbmkt() { + return ygbmkt; + } + + public void setYgbmkt(String ygbmkt) { + this.ygbmkt = ygbmkt; + } + + public String getYgeky() { + return ygeky; + } + + public void setYgeky(String ygeky) { + this.ygeky = ygeky; + } + + public String getYgekt() { + return ygekt; + } + + public void setYgekt(String ygekt) { + this.ygekt = ygekt; + } + + public String getYghxkt() { + return yghxkt; + } + + public void setYghxkt(String yghxkt) { + this.yghxkt = yghxkt; + } + + public String getWlTong() { + return wlTong; + } + + public void setWlTong(String wlTong) { + this.wlTong = wlTong; + } + + public String getWlXin() { + return wlXin; + } + + public void setWlXin(String wlXin) { + this.wlXin = wlXin; + } + + public String getWlGai() { + return wlGai; + } + + public void setWlGai(String wlGai) { + this.wlGai = wlGai; + } + + public String getWlMei() { + return wlMei; + } + + public void setWlMei(String wlMei) { + this.wlMei = wlMei; + } + + public String getWlTie() { + return wlTie; + } + + public void setWlTie(String wlTie) { + this.wlTie = wlTie; + } + + public String getWlQian() { + return wlQian; + } + + public void setWlQian(String wlQian) { + this.wlQian = wlQian; + } + + public String getWlGe() { + return wlGe; + } + + public void setWlGe(String wlGe) { + this.wlGe = wlGe; + } + + public String getWlMeng() { + return wlMeng; + } + + public void setWlMeng(String wlMeng) { + this.wlMeng = wlMeng; + } + + public String getYgbmkyNum() { + return ygbmkyNum; + } + + public void setYgbmkyNum(String ygbmkyNum) { + this.ygbmkyNum = ygbmkyNum; + } + + public String getYgbmktNum() { + return ygbmktNum; + } + + public void setYgbmktNum(String ygbmktNum) { + this.ygbmktNum = ygbmktNum; + } + + public String getYgekyNum() { + return ygekyNum; + } + + public void setYgekyNum(String ygekyNum) { + this.ygekyNum = ygekyNum; + } + + public String getYgektNum() { + return ygektNum; + } + + public void setYgektNum(String ygektNum) { + this.ygektNum = ygektNum; + } + + public String getYghxktNum() { + return yghxktNum; + } + + public void setYghxktNum(String yghxktNum) { + this.yghxktNum = yghxktNum; + } + + public String getXqgbzam() { + return xqgbzam; + } + + public void setXqgbzam(String xqgbzam) { + this.xqgbzam = xqgbzam; + } + + public String getXqgczam() { + return xqgczam; + } + + public void setXqgczam(String xqgczam) { + this.xqgczam = xqgczam; + } + + public String getAlbumin() { + return albumin; + } + + public void setAlbumin(String albumin) { + this.albumin = albumin; + } + + public String getTotalBilirubin() { + return totalBilirubin; + } + + public void setTotalBilirubin(String totalBilirubin) { + this.totalBilirubin = totalBilirubin; + } + + public String getJhBilirubin() { + return jhBilirubin; + } + + public void setJhBilirubin(String jhBilirubin) { + this.jhBilirubin = jhBilirubin; + } + + public String getBcgYs() { + return bcgYs; + } + + public void setBcgYs(String bcgYs) { + this.bcgYs = bcgYs; + } + + public String getBcgXz() { + return bcgXz; + } + + public void setBcgXz(String bcgXz) { + this.bcgXz = bcgXz; + } + + public String getBcgHbx() { + return bcgHbx; + } + + public void setBcgHbx(String bcgHbx) { + this.bcgHbx = bcgHbx; + } + + public String getBcgBxb() { + return bcgBxb; + } + + public void setBcgBxb(String bcgBxb) { + this.bcgBxb = bcgBxb; + } + + public String getBcgSpxb() { + return bcgSpxb; + } + + public void setBcgSpxb(String bcgSpxb) { + this.bcgSpxb = bcgSpxb; + } + + public String getBcgZlxb() { + return bcgZlxb; + } + + public void setBcgZlxb(String bcgZlxb) { + this.bcgZlxb = bcgZlxb; + } + + public String getBcgDfkl() { + return bcgDfkl; + } + + public void setBcgDfkl(String bcgDfkl) { + this.bcgDfkl = bcgDfkl; + } + + public String getBcgZfkl() { + return bcgZfkl; + } + + public void setBcgZfkl(String bcgZfkl) { + this.bcgZfkl = bcgZfkl; + } + + public String getBcgJxw() { + return bcgJxw; + } + + public void setBcgJxw(String bcgJxw) { + this.bcgJxw = bcgJxw; + } + + public String getBcgZwxw() { + return bcgZwxw; + } + + public void setBcgZwxw(String bcgZwxw) { + this.bcgZwxw = bcgZwxw; + } + + public String getBcgZbj() { + return bcgZbj; + } + + public void setBcgZbj(String bcgZbj) { + this.bcgZbj = bcgZbj; + } + + public String getBcgZj() { + return bcgZj; + } + + public void setBcgZj(String bcgZj) { + this.bcgZj = bcgZj; + } + + public String getBcgJsc() { + return bcgJsc; + } + + public void setBcgJsc(String bcgJsc) { + this.bcgJsc = bcgJsc; + } + + public String getBcgYc() { + return bcgYc; + } + + public void setBcgYc(String bcgYc) { + this.bcgYc = bcgYc; + } + + public String getBcgQw() { + return bcgQw; + } + + public void setBcgQw(String bcgQw) { + this.bcgQw = bcgQw; + } + + public String getWssa() { + return wssa; + } + + public void setWssa(String wssa) { + this.wssa = wssa; + } + + public String getJcwd() { + return jcwd; + } + + public void setJcwd(String jcwd) { + this.jcwd = jcwd; + } + + public String getWsse() { + return wsse; + } + + public void setWsse(String wsse) { + this.wsse = wsse; + } + + public Map getRzfx() { + return rzfx; + } + + public void setRzfx(Map rzfx) { + this.rzfx = rzfx; + } + + public Map getChatSc() { + return chatSc; + } + + public void setChatSc(Map chatSc) { + this.chatSc = chatSc; + } + + public Map getYyfyTest() { + return yyfyTest; + } + + public void setYyfyTest(Map yyfyTest) { + this.yyfyTest = yyfyTest; + } + + public String getZlcp() { + return zlcp; + } + + public void setZlcp(String zlcp) { + this.zlcp = zlcp; + } + + public String getGdzsc() { + return gdzsc; + } + + public void setGdzsc(String gdzsc) { + this.gdzsc = gdzsc; + } + + public String getSsfx() { + return ssfx; + } + + public void setSsfx(String ssfx) { + this.ssfx = ssfx; + } + + public String getGjzh() { + return gjzh; + } + + public void setGjzh(String gjzh) { + this.gjzh = gjzh; + } + + public String getRxnl() { + return rxnl; + } + + public void setRxnl(String rxnl) { + this.rxnl = rxnl; + } + + public String getXxbsc() { + return xxbsc; + } + + public void setXxbsc(String xxbsc) { + this.xxbsc = xxbsc; + } + + public String getZlsc() { + return zlsc; + } + + public void setZlsc(String zlsc) { + this.zlsc = zlsc; + } + + public String getQtfz() { + return qtfz; + } + + public void setQtfz(String qtfz) { + this.qtfz = qtfz; + } + + public Integer getTcType() { + return tcType; + } + + public void setTcType(Integer tcType) { + this.tcType = tcType; + } + public String getHemoglobinCoupon() { return hemoglobinCoupon; } @@ -271,11 +996,11 @@ public class BabyCheckPageResult { this.hemoglobinCoupon = hemoglobinCoupon; } - public String getNavel() { + public Map getNavel() { return navel; } - public void setNavel(String navel) { + public void setNavel(Map navel) { this.navel = navel; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index c2a19c1..984ae63 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -9,6 +9,7 @@ import java.util.Map; public class BabyCheckResult { private String id; + // 血红蛋白券 private String hemoglobinCoupon; @@ -53,28 +54,6 @@ public class BabyCheckResult { private String couponCode; - public String getCouponCode() { - return couponCode; - } - - public void setCouponCode(String couponCode) { - this.couponCode = couponCode; - } - - - public String getYlSelect() { - return ylSelect; - } - - public void setYlSelect(String ylSelect) { - this.ylSelect = ylSelect; - } - - /******问诊情况****/ - - /******一般检查****/ - - //体温 private String temperature; @@ -249,6 +228,741 @@ public class BabyCheckResult { //脐部 private Map navel; + // 检查套餐 + private Integer tcType; + + /******新加问诊情况****/ + //吃奶情况 + public String cnqk; + //每天吃奶次数 + public String mtcnNum; + //小便次数 + public String xbNum; + //大便次数 + public String dbNum; + //脐带脱落的时间 + public String qdtlTime; + //皮肤黄染消退的时间 + public String pfhrTime; + //维生素AD + public String wssAd; + //两次随访间患病情况 + public Map douhbqk; + /******新加问诊情况****/ + + /******新增儿科检查****/ + //口腔 + public String kq; + // 出牙数 + public String cyNum; + //龋齿 + public String qcNum; + //咽/扁桃体 + public String btt; + //心肺 + public String xf; + /******新增儿科检查****/ + + /******新增辅助检查开始****/ + /**心理行为发育测评**/ + // CIASS筛查 + private Map xlClass; + // dq + private String xldq; + /**心理行为发育测评**/ + //尿碘 + public String nd; + /*****乙肝五项***/ + // 乙肝表面抗原 + private String ygbmky; + //乙肝表面抗体 + private String ygbmkt; + //乙肝e抗原 + private String ygeky; + // 乙肝e抗体 + private String ygekt; + // 乙肝核心抗体 + private String yghxkt; + //铜 + private String wlTong; + //锌 + private String wlXin; + //钙 + private String wlGai; + //镁 + private String wlMei; + //铁 + private String wlTie; + //铅 + private String wlQian; + //镉 + private String wlGe; + //锰 + private String wlMeng; + /*****乙肝五项***/ + + /*****乙肝五项定量***/ + // 乙肝表面抗原 + private String ygbmkyNum; + //乙肝表面抗体 + private String ygbmktNum; + //乙肝e抗原 + private String ygekyNum; + // 乙肝e抗体 + private String ygektNum; + // 乙肝核心抗体 + private String yghxktNum; + /*****乙肝五项定量***/ + + /*****肝功能***/ + //血清谷丙转氨酶 + private String xqgbzam; + //血清谷草转氨酶 + private String xqgczam; + //白蛋白 + private String albumin; + //总胆红素 + private String totalBilirubin; + //结合胆红素 + private String jhBilirubin; + /*****肝功能***/ + + /*****便常规***/ + //颜色 + private String bcgYs; + //性状 + private String bcgXz; + //红细胞 + private String bcgHbx; + //白细胞 + private String bcgBxb; + //上皮细胞 + private String bcgSpxb; + //肿瘤细胞 + private String bcgZlxb; + //淀粉颗粒 + private String bcgDfkl; + //脂肪颗粒 + private String bcgZfkl; + //肌纤维 + private String bcgJxw; + //植物纤维 + private String bcgZwxw; + //致病菌 + private String bcgZbj; + //真菌 + private String bcgZj; + //寄生虫 + private String bcgJsc; + //原虫 + private String bcgYc; + //气味 + private String bcgQw; + /*****便常规***/ + //维生素A + private String wssa; + //维生素D + private String jcwd; + //维生素E + private String wsse; + //乳汁分析 + private Map rzfx; + //M-CHAT筛查 + private Map chatSc; + //儿童早期语言发育测评 + private Map yyfyTest; + //智力测评 + private String zlcp; + //孤独症筛查 + private String gdzsc; + //膳食分析 + private String ssfx; + //感觉统合能力检查 + private String gjzh; + //入学能力检查 + private String rxnl; + //先心病筛查 + private String xxbsc; + //智力筛查（DDST） + private String zlsc; + //其他及系统现有的辅助检查项 + private String qtfz; + + + public Integer getTcType() { + return tcType; + } + + public void setTcType(Integer tcType) { + this.tcType = tcType; + } + + public String getCnqk() { + return cnqk; + } + + public void setCnqk(String cnqk) { + this.cnqk = cnqk; + } + + public String getMtcnNum() { + return mtcnNum; + } + + public void setMtcnNum(String mtcnNum) { + this.mtcnNum = mtcnNum; + } + + public String getXbNum() { + return xbNum; + } + + public void setXbNum(String xbNum) { + this.xbNum = xbNum; + } + + public String getDbNum() { + return dbNum; + } + + public void setDbNum(String dbNum) { + this.dbNum = dbNum; + } + + public String getQdtlTime() { + return qdtlTime; + } + + public void setQdtlTime(String qdtlTime) { + this.qdtlTime = qdtlTime; + } + + public String getPfhrTime() { + return pfhrTime; + } + + public void setPfhrTime(String pfhrTime) { + this.pfhrTime = pfhrTime; + } + + public String getWssAd() { + return wssAd; + } + + public void setWssAd(String wssAd) { + this.wssAd = wssAd; + } + + public Map getDouhbqk() { + return douhbqk; + } + + public void setDouhbqk(Map douhbqk) { + this.douhbqk = douhbqk; + } + + public String getKq() { + return kq; + } + + public void setKq(String kq) { + this.kq = kq; + } + + public String getCyNum() { + return cyNum; + } + + public void setCyNum(String cyNum) { + this.cyNum = cyNum; + } + + public String getQcNum() { + return qcNum; + } + + public void setQcNum(String qcNum) { + this.qcNum = qcNum; + } + + public String getBtt() { + return btt; + } + + public void setBtt(String btt) { + this.btt = btt; + } + + public String getXf() { + return xf; + } + + public void setXf(String xf) { + this.xf = xf; + } + + public Map getXlClass() { + return xlClass; + } + + public void setXlClass(Map xlClass) { + this.xlClass = xlClass; + } + + public String getXldq() { + return xldq; + } + + public void setXldq(String xldq) { + this.xldq = xldq; + } + + public String getNd() { + return nd; + } + + public void setNd(String nd) { + this.nd = nd; + } + + public String getYgbmky() { + return ygbmky; + } + + public void setYgbmky(String ygbmky) { + this.ygbmky = ygbmky; + } + + public String getYgbmkt() { + return ygbmkt; + } + + public void setYgbmkt(String ygbmkt) { + this.ygbmkt = ygbmkt; + } + + public String getYgeky() { + return ygeky; + } + + public void setYgeky(String ygeky) { + this.ygeky = ygeky; + } + + public String getYgekt() { + return ygekt; + } + + public void setYgekt(String ygekt) { + this.ygekt = ygekt; + } + + public String getYghxkt() { + return yghxkt; + } + + public void setYghxkt(String yghxkt) { + this.yghxkt = yghxkt; + } + + public String getWlTong() { + return wlTong; + } + + public void setWlTong(String wlTong) { + this.wlTong = wlTong; + } + + public String getWlXin() { + return wlXin; + } + + public void setWlXin(String wlXin) { + this.wlXin = wlXin; + } + + public String getWlGai() { + return wlGai; + } + + public void setWlGai(String wlGai) { + this.wlGai = wlGai; + } + + public String getWlMei() { + return wlMei; + } + + public void setWlMei(String wlMei) { + this.wlMei = wlMei; + } + + public String getWlTie() { + return wlTie; + } + + public void setWlTie(String wlTie) { + this.wlTie = wlTie; + } + + public String getWlQian() { + return wlQian; + } + + public void setWlQian(String wlQian) { + this.wlQian = wlQian; + } + + public String getWlGe() { + return wlGe; + } + + public void setWlGe(String wlGe) { + this.wlGe = wlGe; + } + + public String getWlMeng() { + return wlMeng; + } + + public void setWlMeng(String wlMeng) { + this.wlMeng = wlMeng; + } + + public String getYgbmkyNum() { + return ygbmkyNum; + } + + public void setYgbmkyNum(String ygbmkyNum) { + this.ygbmkyNum = ygbmkyNum; + } + + public String getYgbmktNum() { + return ygbmktNum; + } + + public void setYgbmktNum(String ygbmktNum) { + this.ygbmktNum = ygbmktNum; + } + + public String getYgekyNum() { + return ygekyNum; + } + + public void setYgekyNum(String ygekyNum) { + this.ygekyNum = ygekyNum; + } + + public String getYgektNum() { + return ygektNum; + } + + public void setYgektNum(String ygektNum) { + this.ygektNum = ygektNum; + } + + public String getYghxktNum() { + return yghxktNum; + } + + public void setYghxktNum(String yghxktNum) { + this.yghxktNum = yghxktNum; + } + + public String getXqgbzam() { + return xqgbzam; + } + + public void setXqgbzam(String xqgbzam) { + this.xqgbzam = xqgbzam; + } + + public String getXqgczam() { + return xqgczam; + } + + public void setXqgczam(String xqgczam) { + this.xqgczam = xqgczam; + } + + public String getAlbumin() { + return albumin; + } + + public void setAlbumin(String albumin) { + this.albumin = albumin; + } + + public String getTotalBilirubin() { + return totalBilirubin; + } + + public void setTotalBilirubin(String totalBilirubin) { + this.totalBilirubin = totalBilirubin; + } + + public String getJhBilirubin() { + return jhBilirubin; + } + + public void setJhBilirubin(String jhBilirubin) { + this.jhBilirubin = jhBilirubin; + } + + public String getBcgYs() { + return bcgYs; + } + + public void setBcgYs(String bcgYs) { + this.bcgYs = bcgYs; + } + + public String getBcgXz() { + return bcgXz; + } + + public void setBcgXz(String bcgXz) { + this.bcgXz = bcgXz; + } + + public String getBcgHbx() { + return bcgHbx; + } + + public void setBcgHbx(String bcgHbx) { + this.bcgHbx = bcgHbx; + } + + public String getBcgBxb() { + return bcgBxb; + } + + public void setBcgBxb(String bcgBxb) { + this.bcgBxb = bcgBxb; + } + + public String getBcgSpxb() { + return bcgSpxb; + } + + public void setBcgSpxb(String bcgSpxb) { + this.bcgSpxb = bcgSpxb; + } + + public String getBcgZlxb() { + return bcgZlxb; + } + + public void setBcgZlxb(String bcgZlxb) { + this.bcgZlxb = bcgZlxb; + } + + public String getBcgDfkl() { + return bcgDfkl; + } + + public void setBcgDfkl(String bcgDfkl) { + this.bcgDfkl = bcgDfkl; + } + + public String getBcgZfkl() { + return bcgZfkl; + } + + public void setBcgZfkl(String bcgZfkl) { + this.bcgZfkl = bcgZfkl; + } + + public String getBcgJxw() { + return bcgJxw; + } + + public void setBcgJxw(String bcgJxw) { + this.bcgJxw = bcgJxw; + } + + public String getBcgZwxw() { + return bcgZwxw; + } + + public void setBcgZwxw(String bcgZwxw) { + this.bcgZwxw = bcgZwxw; + } + + public String getBcgZbj() { + return bcgZbj; + } + + public void setBcgZbj(String bcgZbj) { + this.bcgZbj = bcgZbj; + } + + public String getBcgZj() { + return bcgZj; + } + + public void setBcgZj(String bcgZj) { + this.bcgZj = bcgZj; + } + + public String getBcgJsc() { + return bcgJsc; + } + + public void setBcgJsc(String bcgJsc) { + this.bcgJsc = bcgJsc; + } + + public String getBcgYc() { + return bcgYc; + } + + public void setBcgYc(String bcgYc) { + this.bcgYc = bcgYc; + } + + public String getBcgQw() { + return bcgQw; + } + + public void setBcgQw(String bcgQw) { + this.bcgQw = bcgQw; + } + + public String getWssa() { + return wssa; + } + + public void setWssa(String wssa) { + this.wssa = wssa; + } + + public String getJcwd() { + return jcwd; + } + + public void setJcwd(String jcwd) { + this.jcwd = jcwd; + } + + public String getWsse() { + return wsse; + } + + public void setWsse(String wsse) { + this.wsse = wsse; + } + + public Map getRzfx() { + return rzfx; + } + + public void setRzfx(Map rzfx) { + this.rzfx = rzfx; + } + + public Map getChatSc() { + return chatSc; + } + + public void setChatSc(Map chatSc) { + this.chatSc = chatSc; + } + + public Map getYyfyTest() { + return yyfyTest; + } + + public void setYyfyTest(Map yyfyTest) { + this.yyfyTest = yyfyTest; + } + + public String getZlcp() { + return zlcp; + } + + public void setZlcp(String zlcp) { + this.zlcp = zlcp; + } + + public String getGdzsc() { + return gdzsc; + } + + public void setGdzsc(String gdzsc) { + this.gdzsc = gdzsc; + } + + public String getSsfx() { + return ssfx; + } + + public void setSsfx(String ssfx) { + this.ssfx = ssfx; + } + + public String getGjzh() { + return gjzh; + } + + public void setGjzh(String gjzh) { + this.gjzh = gjzh; + } + + public String getRxnl() { + return rxnl; + } + + public void setRxnl(String rxnl) { + this.rxnl = rxnl; + } + + public String getXxbsc() { + return xxbsc; + } + + public void setXxbsc(String xxbsc) { + this.xxbsc = xxbsc; + } + + public String getZlsc() { + return zlsc; + } + + public void setZlsc(String zlsc) { + this.zlsc = zlsc; + } + + public String getQtfz() { + return qtfz; + } + + public void setQtfz(String qtfz) { + this.qtfz = qtfz; + } + + public String getCouponCode() { + return couponCode; + } + + public void setCouponCode(String couponCode) { + this.couponCode = couponCode; + } + + + public String getYlSelect() { + return ylSelect; + } + + public void setYlSelect(String ylSelect) { + this.ylSelect = ylSelect; + } + + /******问诊情况****/ + + /******一般检查****/ + + public String getSportsEvaluation() { return sportsEvaluation; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index be471fa..5484c3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; +import org.springframework.util.StopWatch; import javax.servlet.http.HttpServletResponse; import java.util.*; @@ -85,9 +86,17 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS query.setEndBuildDay(buildEnd); //妇女建档主数据 List modelList = residentsArchiveService.queryResident(query); - restList = getResidentMainData(modelList); - + StopWatch stopWatch = new StopWatch("妇女建档主数据"); + //优化前 + // stopWatch.start("妇女建档优化前"); + // restList = getResidentMainData(modelList); + // stopWatch.stop(); + //优化后 + stopWatch.start("妇女建档优化后"); + restList = dispResidentMainData(modelList,hospitalId); + stopWatch.stop(); archiveModelCount = query.getCount(); + System.out.println(stopWatch.toString()); } else {//孕妇建档主数据 PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setBookbuildingDateStart(checkStart); @@ -103,7 +112,17 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS patientsQuery.setHospitalId(hospitalId); patientsQuery.setQueryNo(key); List patientsList = patientsService.queryPatient(patientsQuery); - restList = getPatientMainData(patientsList); + StopWatch stopWatch = new StopWatch("孕妇建档主数据"); + //优化前 + // stopWatch.start("孕妇建档优化前"); + // restList = getPatientMainData(patientsList); + // stopWatch.stop(); + // System.out.println(stopWatch.toString()); + //优化后 + stopWatch.start("孕妇建档优化后"); + restList = dispPatient(patientsList,hospitalId); + stopWatch.stop(); + System.out.println(stopWatch.toString()); archiveModelCount = patientsQuery.getCount(); } @@ -111,6 +130,81 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS return RespBuilder.buildSuccess("tabList", new PageResult(archiveModelCount, page, limit, restList)); } + private List> dispResidentMainData(List residentsArchiveModels, String hospitalId) { + List> archiveModelList = new ArrayList<>(); + + List patients = new ArrayList<>(); + + for (ResidentsArchiveModel archiveModel : residentsArchiveModels) { + Map temp = new HashMap<>(); + temp.put("bookbuild", 3);//孕期建档默认空白 + temp.put("cqsc", 3);//产前筛查默认空白 + temp.put("fm", 3);//分娩空白 + temp.put("chfc", 3);//产后复查空白 + temp.put("resident", 1); // 妇女建档 + temp.put("check", 3); // 婚检 + + temp.put("id", archiveModel.getId()); + temp.put("cardNo", StringUtils.encryCardNo(archiveModel.getCertificateNum())); + temp.put("username", archiveModel.getUsername()); + temp.put("phone", StringUtils.encryPhone(archiveModel.getPhone())); + temp.put("age", DateUtil.getAge(archiveModel.getBirthday())); + temp.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); // 妇女建档日期 + + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setHospitalId(archiveModel.getHospitalId()); + if (archiveModel.getCertificateNum() != null) { + patientsQuery.setCardNo(archiveModel.getCertificateNum()); + } else if (archiveModel.getPhone() != null) { + patientsQuery.setPhone(archiveModel.getPhone()); + } else if (archiveModel.getVcCardNo() != null) { + patientsQuery.setVcCardNo(archiveModel.getVcCardNo()); + } + //有效 + patientsQuery.setYn(1); + patientsQuery.setTypeList(Arrays.asList(1, 3)); + + + //怀孕建档 + List patientsList = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patientsList)) { + patients.add(patientsList.get(0)); + } else { + //婚检 + Long checkNum = mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(archiveModel.getCertificateNum()).and("hospitalId").is(archiveModel.getHospitalId()).and("yn").is(1)), PremaritalCheckup.class); + TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setSource(archiveModel.getId()); + downRecordQuery.setStatus(0); + List records = trackDownRecordService.queryTrackDown(downRecordQuery); + TrackDownRecord trackDownRecord = null; + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) { + trackDownRecord = records.get(0); + } else {//根据patient查询是否存在追访信息 + //根据医院id和身份证或手机号进行查询 + downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setStatus(3);//查询全部 + downRecordQuery.setResidentsArchiveId(archiveModel.getId()); + records = trackDownRecordService.queryTrackDown(downRecordQuery); + if (CollectionUtils.isNotEmpty(records)) {// + trackDownRecord = records.get(0); + } + } + if(checkNum>0){ + temp.put("check", 1); // 婚检 1=勾勾 2=叉叉 + }else{ + if (trackDownRecord!=null && trackDownRecord.getTrackType() > TrackDownDateEnums.A.getId()) { + temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉 + } + } + isExitTrackDown(trackDownRecord, temp); + archiveModelList.add(temp); + } + archiveModelList.addAll(dispPatient(patientsList, hospitalId)); + } + return archiveModelList; + } + private List> getResidentMainData(List residentsArchiveModels) { List> archiveModelList = new ArrayList<>(); @@ -123,6 +217,15 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("chfc", 3);//产后复查空白 temp.put("resident", 1); // 妇女建档 temp.put("check", 3); // 婚检 + + temp.put("id", archiveModel.getId()); + temp.put("cardNo", StringUtils.encryCardNo(archiveModel.getCertificateNum())); + temp.put("username", archiveModel.getUsername()); + temp.put("phone", StringUtils.encryPhone(archiveModel.getPhone())); + temp.put("age", DateUtil.getAge(archiveModel.getBirthday())); + temp.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); // 妇女建档日期 + + //婚检 Long checkNum = mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(archiveModel.getCertificateNum()).and("hospitalId").is(archiveModel.getHospitalId()).and("yn").is(1)), PremaritalCheckup.class); PatientsQuery patientsQuery = new PatientsQuery(); @@ -137,6 +240,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS //有效 patientsQuery.setYn(1); patientsQuery.setTypeList(Arrays.asList(1, 3)); + + //怀孕建档 List patientsList = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patientsList)) { @@ -145,7 +250,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉 temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); //完善分娩方式 - patientFmType(temp,patients); + patientFmType(temp, patients); //孕检次数 temp.put("yjcount", getChuzhenCount(patients.getId())); if (patients.getType() == 3) { @@ -185,19 +290,13 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } } - temp.put("id", archiveModel.getId()); - temp.put("cardNo", StringUtils.encryCardNo(archiveModel.getCertificateNum())); - temp.put("username", archiveModel.getUsername()); - temp.put("phone", StringUtils.encryPhone(archiveModel.getPhone())); - temp.put("age", DateUtil.getAge(archiveModel.getBirthday())); - temp.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); // 妇女建档日期 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setSource(archiveModel.getId()); downRecordQuery.setStatus(0); List records = trackDownRecordService.queryTrackDown(downRecordQuery); TrackDownRecord trackDownRecord = null; - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) { trackDownRecord = records.get(0); } else {//根据patient查询是否存在追访信息 //根据医院id和身份证或手机号进行查询 @@ -210,13 +309,17 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS downRecordQuery.setPhone(archiveModel.getPhone()); } records = trackDownRecordService.queryTrackDown(downRecordQuery); - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {// + if (CollectionUtils.isNotEmpty(records)) {// trackDownRecord = records.get(0); } } - if (trackDownRecord.getTrackType() > TrackDownDateEnums.A.getId()) { - temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉 + if(checkNum>0){ + temp.put("check", 1); // 婚检 1=勾勾 2=叉叉 + }else{ + if (trackDownRecord!=null && trackDownRecord.getTrackType() > TrackDownDateEnums.A.getId()) { + temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉 + } } isExitTrackDown(trackDownRecord, temp); archiveModelList.add(temp); @@ -224,6 +327,146 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS return archiveModelList; } + private List> dispPatient(List patients, String hospitalId) { + List> restList = new ArrayList<>(); + + Map> cardMap = new HashMap<>(); + Map> pidMap = new HashMap<>(); + List cardNos = new ArrayList<>(); + + + List ps = new ArrayList<>(); + + for (Patients patient : patients) { + + cardNos.add(patient.getCardNo()); + + Map temp = new HashMap<>(); + temp.put("cqsc", 3);//产前筛查默认空白 + temp.put("fm", 3);//分娩空白 + temp.put("chfc", 3);//产后复查空白 + temp.put("id", patient.getId()); + temp.put("cardNo", StringUtils.encryCardNo(patient.getCardNo())); + temp.put("username", patient.getUsername()); + temp.put("phone", StringUtils.encryPhone(patient.getPhone())); + temp.put("age", DateUtil.getAge(patient.getBirth())); + //建档时间 + temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate())); + temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉 + temp.put("check", 2); // 婚检 1=勾勾 2=叉叉 + temp.put("resident", 2); // 妇女建档 1=勾勾 2=叉叉 + + + //终止妊娠,或自动分娩 + if ((patient.getDueStatus() != null && patient.getDueStatus() == 1) || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) { + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 + } else { + if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) { + /** 生产方式 */ + temp.put("fmType", "自动分娩"); + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 + }else if(patient.getType() == 3){//可能本院分娩或外院分娩 + temp.put("fm", 2); // 默认外院分娩 + } + } + + //获取产检次数 + temp.put("yjcount", getChuzhenCount(patient.getId())); + + if (patient.getDueStatus() != null && patient.getDueStatus() == 1) {//终止妊娠 + //当前孕妇是孕28周后，进入产后复查追访，否则结束流程 + int dueWeek = DateUtil.getWeek2(patient.getLastMenses(), patient.getFmDate()); + if (dueWeek < 28) {//进入产后复查 + temp.put("chfc", 2); + } + } + + if (patient.getType() == 3) {//已经分娩，就是X + temp.put("cqsc", 2);//产前筛查){ + } else {//未分娩， + int week = DateUtil.getWeek2(patient.getLastMenses(), new Date()); + if (week > 20) {//不能做产前筛查追访，产前检查追访 + temp.put("cqsc", 2);//未做产筛 + } + } + + cardMap.put(patient.getCardNo(), temp); + pidMap.put(patient.getId(), temp); + ps.add(patient.getId()); + restList.add(temp); + } + + //婚检查询 + List premaritalCheckups = mongoTemplate.find(Query.query(Criteria.where("certificateNum").in(cardNos).and("hospitalId").is(hospitalId).and("yn").is(1)), PremaritalCheckup.class); + for (PremaritalCheckup pr : premaritalCheckups) { + if (cardMap.containsKey(pr.getCertificateNum())) {//身份证一致 + Map temp = cardMap.get(pr.getCertificateNum()); + temp.put("check", 1);//婚检 1=勾勾 2=叉叉 + } + } + + //妇女查询 + List residentsArchiveModels = mongoTemplate.find(Query.query(Criteria.where("certificateNum").in(cardNos).and("hospitalId").is(hospitalId).and("yn").is(1)), ResidentsArchiveModel.class); + for (ResidentsArchiveModel re : residentsArchiveModels) { + if (cardMap.containsKey(re.getCertificateNum())) {//身份证一致 + Map temp = cardMap.get(re.getCertificateNum()); + temp.put("resident", 1); // 妇女建档 + temp.put("residentDate", DateUtil.getyyyy_MM_dd(re.getBuildDay())); // 妇女建档日期 + } + } + + //产筛查询 + List sieveResultModels = mongoTemplate.find(Query.query(Criteria.where("parentId").in(ps).and("yn").is(1)), SieveResultModel.class); + + + for (SieveResultModel si : sieveResultModels) { + if (pidMap.containsKey(si.getParentId())) { + Map temp = pidMap.get(si.getParentId()); + temp.put("cqsc", 1);//产前筛查 + } + } + + //分娩查询 + List maternalDeliverModels = mongoTemplate.find(Query.query(Criteria.where("parentId").in(ps).and("hospitalId").is(hospitalId).and("yn").is(1)), MaternalDeliverModel.class); + for (MaternalDeliverModel ma : maternalDeliverModels) { + if (pidMap.containsKey(ma.getParentId())) { + Map temp = pidMap.get(ma.getParentId()); + temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 + if (StringUtils.isNotEmpty(ma.getDeliveryMode())) { + Map deliveryModeMap = JsonUtil.getMap(ma.getDeliveryMode()); + if (deliveryModeMap.containsKey("fmfs")) { + /** 生产方式 */ + temp.put("fmType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs"))); + } + } + } + } + + //产后复查查询 + List postReviewModels = mongoTemplate.find(Query.query(Criteria.where("parentId").in(ps).and("hospitalId").is(hospitalId).and("yn").is(1)), PostReviewModel.class); + for (PostReviewModel po : postReviewModels) { + if (pidMap.containsKey(po.getParentId())) { + Map temp = pidMap.get(po.getParentId()); + temp.put("chfc", 1); + if (temp.containsKey("chfcCount")) { + temp.put("chfcCount", (int) temp.get("chfcCount") + 1);// 复查次数 + } else { + temp.put("chfcCount", 1); // 复查次数 + } + } + } + + //追访查询 + List trackDownRecords = mongoTemplate.find(Query.query(Criteria.where("parentId").in(ps)), TrackDownRecord.class); + for (TrackDownRecord tr : trackDownRecords) { + if (pidMap.containsKey(tr.getParentId())) { + Map temp = pidMap.get(tr.getParentId()); + isExitTrackDown(tr, temp); + } + } + return restList; + } + private List> getPatientMainData(List patients) { List> restList = new ArrayList<>(); for (Patients patient : patients) { // type: 1=孕期 3=产后 @@ -260,7 +503,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate())); temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉 //完善分娩方式 - patientFmType(temp,patient); + patientFmType(temp, patient); //孕检次数 temp.put("yjcount", getChuzhenCount(patient.getId())); @@ -317,7 +560,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS return restList; } - public void patientFmType(Map temp,Patients patient){ + public void patientFmType(Map temp, Patients patient) { //终止妊娠,或自动分娩 if ((patient.getDueStatus() != null && patient.getDueStatus() == 1) || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) { temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 @@ -338,12 +581,12 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS MaternalDeliverModel maternalDeliverModel = list2.get(0); if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { Map deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode()); - if(deliveryModeMap.containsKey("fmfs")){ + if (deliveryModeMap.containsKey("fmfs")) { /** 生产方式 */ temp.put("fmType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs"))); } } - } else { + } else {//不是本院分娩 temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } } @@ -442,11 +685,11 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS TrackDownRecord trackDownRecord1 = trackDownRecordService.getTrackDown(trackDownRecord.getId()); if (trackDownRecord1 != null) { //流程只能往下流转，不能往上回退,，因为9,10,11,12,是后面加入的产筛转出流程所以不做判断 - /* if (trackDownRecord.getTrackType() != null && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) { + if (trackDownRecord.getTrackType() != null && trackDownRecord.getTrackType()!=8 && trackDownRecord.getTrackType()!=9 && trackDownRecord.getTrackType()!=10&&trackDownRecord.getTrackType()!=11 && trackDownRecord.getTrackType() < trackDownRecord1.getTrackType().intValue()) { //用以前追访的类型和来源id trackDownRecord.setTrackType(trackDownRecord1.getTrackType()); trackDownRecord.setSource(trackDownRecord1.getSource()); - }*/ + } //由显示修改成不显示，后期数据更新时，不允许将不显示修改成显示。 if (trackDownRecord1.getStatus() < trackDownRecord.getStatus()) { trackDownRecord.setStatus(trackDownRecord1.getStatus()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java index d44b115..e0ccc77 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java @@ -32,6 +32,9 @@ public class UnitConstants { public static final String WENDU = " ℃"; public static final String WSSD = " IU/日"; public static final String DAY = " 天"; + public static final String KE = " 颗"; + public static final String GG = " ug/L"; + public static final String NG = " ng/L"; }