liquanyu / regional-platform

Download as
Browse Code »

Commit 25230f5d8a356f5381a967f0b0d086f6ae4888fa

Authored by yangfei
2 parents 3eca03f88a 24e5e18e7d
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java View file @ 25230f5
... ... @@ -107,11 +107,11 @@
107 107 */
108 108 /** key>> 1=孕妇 2=儿童 3=产妇 */
109 109 /**
110   - * value>> 1=孕妇建档 2=孕妇产检 3=产妇建档 4=产妇分娩 5=产妇出院小结 6=产妇产后复查 7=儿童建档 8=儿童保健
  110 + * value>> 1=孕妇建档 2=孕妇产检 3=产妇建档 4=产妇分娩 5=产妇出院小结 6=产妇产后复查 7=儿童建档 8=儿童保健 9=新生儿访视 10=血红蛋白检查 11=产筛券
111 111 */
112 112 private Map<String, List<Integer>> typeMap = new HashMap<String, List<Integer>>() {
113 113 {
114   - put(PREGNANT_WOMAN, Arrays.asList(1, 2, 4, 5, 6));
  114 + put(PREGNANT_WOMAN, Arrays.asList(1, 2, 4, 5, 6,11));
115 115 put(CHILDREN, Arrays.asList(7, 8, 9, 10));
116 116 put(MATERNAL_NCHILDBIRTH_NHOSPITAL, Arrays.asList(3, 4, 5, 6));
117 117 put(MATERNAL_YCHILDBIRTH_NHOSPITAL, Arrays.asList(5, 6));
... ... @@ -329,7 +329,9 @@
329 329 if (1 == personType || 3 == personType) {
330 330 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class);
331 331 if (patients != null) {
332   - couponInfo.setUseDate(patients.getBookbuildingDate());
  332 + //徐倩要求添加的 ，以后有什么问题她负责 20180712
  333 + couponInfo.setUseDate(new Date());
  334 + //couponInfo.setUseDate(patients.getBookbuildingDate());
333 335 couponInfo.setOperatorUseId(patients.getBookbuildingDoctor());
334 336 couponInfo.setUsedHospitalId(patients.getHospitalId());
335 337 couponInfo.setUsedId(patients.getId());
... ... @@ -337,7 +339,9 @@
337 339 } else {
338 340 BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), BabyModel.class);
339 341 if (baby != null) {
340   - couponInfo.setUseDate(baby.getBuildDate());
  342 + //徐倩要求添加的 ，以后有什么问题她负责 20180712
  343 + couponInfo.setUseDate(new Date());
  344 + //couponInfo.setUseDate(baby.getBuildDate());
341 345 couponInfo.setOperatorUseId(baby.getBuildDoctor());
342 346 couponInfo.setUsedHospitalId(baby.getHospitalId());
343 347 couponInfo.setUsedId(baby.getId());
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 25230f5
... ... @@ -214,6 +214,265 @@
214 214 public String electr;
215 215 public List<String> mHighRiskReason;
216 216  
  217 +
  218 + /**承德区域功能*****/
  219 +
  220 +
  221 + //血红蛋白值
  222 + //private String xhdb;
  223 + //白细胞计数值
  224 + private String bxbjs;
  225 + // 血小板
  226 + private String platelet;
  227 + //血常规其他
  228 + private String chgOther;
  229 + //尿蛋白
  230 + //private String ndb;
  231 + //尿糖
  232 + private String nt;
  233 + //尿同体
  234 + private String urineKetone;
  235 + //尿潜血
  236 + private String bld;
  237 + //尿常规其他
  238 + private String ncgOther;
  239 + //血型
  240 + private String abo;
  241 + //RH血型
  242 + private String rh;
  243 +
  244 + //血清谷丙转氨酶
  245 + private String xqgbzam;
  246 + //血清谷草转氨酶
  247 + private String xqgczam;
  248 + //白蛋白
  249 + private String albumin;
  250 + //总胆红素
  251 + private String totalBilirubin;
  252 + //结合胆红素
  253 + private String jhBilirubin;
  254 +
  255 + //丙肝
  256 + private String bg;
  257 + // 乙肝表面抗原
  258 + private String ygbmky;
  259 + //乙肝表面抗体
  260 + private String ygbmkt;
  261 + //乙肝e抗原
  262 + private String ygeky;
  263 + // 乙肝e抗体
  264 + private String ygekt;
  265 + // 乙肝核心抗体
  266 + private String yghxkt;
  267 +
  268 + //血清肌
  269 + private String xqjq;
  270 + //血尿素氮
  271 + private String xnsd;
  272 +
  273 + //实验结果
  274 + private String syjg;
  275 +
  276 + //hit抗体检测
  277 + private String hivkt;
  278 +
  279 + public String getBxbjs() {
  280 + return bxbjs;
  281 + }
  282 +
  283 + public void setBxbjs(String bxbjs) {
  284 + this.bxbjs = bxbjs;
  285 + }
  286 +
  287 + public String getPlatelet() {
  288 + return platelet;
  289 + }
  290 +
  291 + public void setPlatelet(String platelet) {
  292 + this.platelet = platelet;
  293 + }
  294 +
  295 + public String getChgOther() {
  296 + return chgOther;
  297 + }
  298 +
  299 + public void setChgOther(String chgOther) {
  300 + this.chgOther = chgOther;
  301 + }
  302 +
  303 + public String getNt() {
  304 + return nt;
  305 + }
  306 +
  307 + public void setNt(String nt) {
  308 + this.nt = nt;
  309 + }
  310 +
  311 + public String getUrineKetone() {
  312 + return urineKetone;
  313 + }
  314 +
  315 + public void setUrineKetone(String urineKetone) {
  316 + this.urineKetone = urineKetone;
  317 + }
  318 +
  319 + public String getBld() {
  320 + return bld;
  321 + }
  322 +
  323 + public void setBld(String bld) {
  324 + this.bld = bld;
  325 + }
  326 +
  327 + public String getNcgOther() {
  328 + return ncgOther;
  329 + }
  330 +
  331 + public void setNcgOther(String ncgOther) {
  332 + this.ncgOther = ncgOther;
  333 + }
  334 +
  335 + public String getAbo() {
  336 + return abo;
  337 + }
  338 +
  339 + public void setAbo(String abo) {
  340 + this.abo = abo;
  341 + }
  342 +
  343 + public String getRh() {
  344 + return rh;
  345 + }
  346 +
  347 + public void setRh(String rh) {
  348 + this.rh = rh;
  349 + }
  350 +
  351 + public String getXqgbzam() {
  352 + return xqgbzam;
  353 + }
  354 +
  355 + public void setXqgbzam(String xqgbzam) {
  356 + this.xqgbzam = xqgbzam;
  357 + }
  358 +
  359 + public String getXqgczam() {
  360 + return xqgczam;
  361 + }
  362 +
  363 + public void setXqgczam(String xqgczam) {
  364 + this.xqgczam = xqgczam;
  365 + }
  366 +
  367 + public String getAlbumin() {
  368 + return albumin;
  369 + }
  370 +
  371 + public void setAlbumin(String albumin) {
  372 + this.albumin = albumin;
  373 + }
  374 +
  375 + public String getTotalBilirubin() {
  376 + return totalBilirubin;
  377 + }
  378 +
  379 + public void setTotalBilirubin(String totalBilirubin) {
  380 + this.totalBilirubin = totalBilirubin;
  381 + }
  382 +
  383 + public String getJhBilirubin() {
  384 + return jhBilirubin;
  385 + }
  386 +
  387 + public void setJhBilirubin(String jhBilirubin) {
  388 + this.jhBilirubin = jhBilirubin;
  389 + }
  390 +
  391 + public String getBg() {
  392 + return bg;
  393 + }
  394 +
  395 + public void setBg(String bg) {
  396 + this.bg = bg;
  397 + }
  398 +
  399 + public String getYgbmky() {
  400 + return ygbmky;
  401 + }
  402 +
  403 + public void setYgbmky(String ygbmky) {
  404 + this.ygbmky = ygbmky;
  405 + }
  406 +
  407 + public String getYgbmkt() {
  408 + return ygbmkt;
  409 + }
  410 +
  411 + public void setYgbmkt(String ygbmkt) {
  412 + this.ygbmkt = ygbmkt;
  413 + }
  414 +
  415 + public String getYgeky() {
  416 + return ygeky;
  417 + }
  418 +
  419 + public void setYgeky(String ygeky) {
  420 + this.ygeky = ygeky;
  421 + }
  422 +
  423 + public String getYgekt() {
  424 + return ygekt;
  425 + }
  426 +
  427 + public void setYgekt(String ygekt) {
  428 + this.ygekt = ygekt;
  429 + }
  430 +
  431 + public String getYghxkt() {
  432 + return yghxkt;
  433 + }
  434 +
  435 + public void setYghxkt(String yghxkt) {
  436 + this.yghxkt = yghxkt;
  437 + }
  438 +
  439 + public String getXqjq() {
  440 + return xqjq;
  441 + }
  442 +
  443 + public void setXqjq(String xqjq) {
  444 + this.xqjq = xqjq;
  445 + }
  446 +
  447 + public String getXnsd() {
  448 + return xnsd;
  449 + }
  450 +
  451 + public void setXnsd(String xnsd) {
  452 + this.xnsd = xnsd;
  453 + }
  454 +
  455 + public String getSyjg() {
  456 + return syjg;
  457 + }
  458 +
  459 + public void setSyjg(String syjg) {
  460 + this.syjg = syjg;
  461 + }
  462 +
  463 + public String getHivkt() {
  464 + return hivkt;
  465 + }
  466 +
  467 + public void setHivkt(String hivkt) {
  468 + this.hivkt = hivkt;
  469 + }
  470 +
  471 + /**承德区域功能*****/
  472 +
  473 +
  474 +
  475 +
217 476 public Boolean getSendMsg() {
218 477 return isSendMsg;
219 478 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 25230f5
... ... @@ -1760,8 +1760,8 @@
1760 1760 BabyModelQuery babyQuery = new BabyModelQuery();
1761 1761 babyQuery.setYn(YnEnums.YES.getId());
1762 1762  
1763   -// List<BabyCheckModel> babyCheckList = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.DESC);
1764 1763 List<BabyCheckModel> babyCheckList = babyCheckService.queryBabyCheckRecord(query);
  1764 + List<String> ids = new ArrayList<>();
1765 1765 List<BabyModel> babyModels = new ArrayList<>();
1766 1766 if (CollectionUtils.isNotEmpty(babyCheckList))
1767 1767 {
1768 1768  
... ... @@ -1770,12 +1770,16 @@
1770 1770 String buildId = babyCheck.getBuildId();
1771 1771 if (StringUtils.isNotEmpty(buildId))
1772 1772 {
1773   - babyQuery.setId(buildId);
1774   - List<BabyModel> babyResult = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
1775   - babyModels.addAll(babyResult);
  1773 + if (!ids.contains(buildId))
  1774 + {
  1775 + babyQuery.setId(buildId);
  1776 + List<BabyModel> babyResult = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  1777 + babyModels.addAll(babyResult);
  1778 + }
1776 1779 }
1777 1780 }
1778 1781 }
  1782 + ids.clear();
1779 1783 List<BabyManageListResult> list = new ArrayList<>();
1780 1784 if (CollectionUtils.isNotEmpty(babyModels))
1781 1785 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 25230f5
... ... @@ -407,6 +407,10 @@
407 407 else if("2100001605".equals(model.getHospitalId())){
408 408 model.setVcCardNo(cardNo);
409 409 }
  410 +// //昌邑市妇幼保健院 lis检查表中存的是病历号 需要用身份证号码转换成病历好查询
  411 +// else if("2100001605".equals(model.getHospitalId())){
  412 +// model.setVcCardNo(cardNo); //TODO
  413 +// }
410 414 else {
411 415 model.setVcCardNo(vcCardNo);
412 416 }
... ... @@ -554,7 +558,13 @@
554 558 else if("2100001605".equals(pat.getHospitalId()))
555 559 {
556 560 vcCardNos.add(pat.getCardNo());
557   - }else {
  561 + }
  562 +// //昌邑市妇幼保健院 lis检查表中存的是病历号 需要用身份证号码转换成病历好查询
  563 +// else if("2100001605".equals(pat.getHospitalId())){
  564 +// vcCardNos.add(pat.getCardNo()); //TODO
  565 +// }
  566 + else
  567 + {
558 568 vcCardNos.add(pat.getVcCardNo());
559 569 }
560 570  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 25230f5
... ... @@ -2183,6 +2183,36 @@
2183 2183 //产筛状态
2184 2184 map.put("sieveStatus", sieveFacade.getSieveStatus(patients.getId(), patients.getHospitalId()));
2185 2185  
  2186 +
  2187 + map.put("bxbjs", UnitUtils.unitSplice(data.getBxbjs(), UnitConstants.TEN_LKG));
  2188 + map.put("platelet", UnitUtils.unitSplice(data.getPlatelet(), UnitConstants.TEN_LKG));
  2189 + map.put("chgOther", data.getChgOther());
  2190 +
  2191 + map.put("nt", data.getNt());
  2192 + map.put("urineKetone", data.getUrineKetone());
  2193 + map.put("bld", data.getBld());
  2194 + map.put("ncgOther", data.getNcgOther());
  2195 +
  2196 + map.put("abo", FunvCommonUtil.getBaseicConfigByid(data.getAbo(), basicConfigService));
  2197 + map.put("rh", FunvCommonUtil.checkYiGan(data.getRh()));
  2198 + map.put("bloodSugar", UnitUtils.unitSplice(data.getBloodSugar(), UnitConstants.MMOLL));
  2199 + map.put("xqgbzam", UnitUtils.unitSplice(data.getXqgbzam(), UnitConstants.UL));
  2200 + map.put("xqgczam", UnitUtils.unitSplice(data.getXqgczam(), UnitConstants.UL));
  2201 + map.put("albumin", UnitUtils.unitSplice(data.getAlbumin(), UnitConstants.GL));
  2202 + map.put("totalBilirubin", UnitUtils.unitSplice(data.getTotalBilirubin(), UnitConstants.UMOLL));
  2203 + map.put("jhBilirubin", UnitUtils.unitSplice(data.getJhBilirubin(), UnitConstants.UMOLL));
  2204 + map.put("bg", FunvCommonUtil.checkYiGan(data.getBg()));
  2205 +
  2206 + map.put("ygbmky", FunvCommonUtil.checkYiGan(data.getYgbmky()));
  2207 + map.put("ygbmkt", FunvCommonUtil.checkYiGan(data.getYgbmkt()));
  2208 + map.put("ygeky", FunvCommonUtil.checkYiGan(data.getYgeky()));
  2209 + map.put("ygekt", FunvCommonUtil.checkYiGan(data.getYgekt()));
  2210 + map.put("yghxkt", FunvCommonUtil.checkYiGan(data.getYghxkt()));
  2211 + map.put("xqjq", UnitUtils.unitSplice(data.getXqjq(), UnitConstants.UMOLL));
  2212 + map.put("xnsd", UnitUtils.unitSplice(data.getXnsd(), UnitConstants.MMOLL));
  2213 + map.put("syjg", FunvCommonUtil.checkYiGan(data.getSyjg()));
  2214 + map.put("hivkt", FunvCommonUtil.checkYiGan(data.getHivkt()));
  2215 +
2186 2216 br.setErrorcode(ErrorCodeConstants.SUCCESS);
2187 2217 br.setErrormsg("成功");
2188 2218 br.setData(map);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 25230f5
... ... @@ -194,67 +194,65 @@
194 194 /**承德区域功能*****/
195 195  
196 196  
197   -// //血红蛋白值
198   -// private String xhdb;
199   -// //白细胞计数值
200   -// private String bxbjs;
201   -// // 血小板
202   -// private String platelet;
203   -// //血常规其他
204   -// private String chgOther;
205   -// //尿蛋白
206   -// private String ndb;
207   -// //尿糖
208   -// private String nt;
209   -// //尿同体
210   -// private String urineKetone;
211   -// //尿潜血
212   -// private String bld;
213   -// //尿常规其他
214   -// private String ncgOther;
215   -// //血型
216   -// private String abo;
217   -// //RH血型
218   -// private String rh;
219   -// // 血糖1
220   -// private String bloodSugar;
221   -//
222   -// //血清谷丙转氨酶
223   -// private String xqgbzam;
224   -// //血清谷草转氨酶
225   -// private String xqgczam;
226   -// //白蛋白
227   -// private String albumin;
228   -// //总胆红素
229   -// private String totalBilirubin;
230   -// //结合胆红素
231   -// private String jhBilirubin;
232   -//
233   -// //丙肝
234   -// private String bg;
235   -// // 乙肝表面抗原
236   -// private String ygbmky;
237   -// //乙肝表面抗体
238   -// private String ygbmkt;
239   -// //乙肝e抗原
240   -// private String ygeky;
241   -// // 乙肝e抗体
242   -// private String ygekt;
243   -// // 乙肝核心抗体
244   -// private String yghxkt;
245   -//
246   -// //血清肌
247   -// private String xqjq;
248   -// //血尿素氮
249   -// private String xnsd;
250   -//
251   -// //实验结果
252   -// private String syjg;
253   -//
254   -// //hit抗体检测
255   -// private String hivkt;
  197 + //血红蛋白值
  198 + //private String xhdb;
  199 + //白细胞计数值
  200 + private String bxbjs;
  201 + // 血小板
  202 + private String platelet;
  203 + //血常规其他
  204 + private String chgOther;
  205 + //尿蛋白
  206 + //private String ndb;
  207 + //尿糖
  208 + private String nt;
  209 + //尿同体
  210 + private String urineKetone;
  211 + //尿潜血
  212 + private String bld;
  213 + //尿常规其他
  214 + private String ncgOther;
  215 + //血型
  216 + private String abo;
  217 + //RH血型
  218 + private String rh;
256 219  
  220 + //血清谷丙转氨酶
  221 + private String xqgbzam;
  222 + //血清谷草转氨酶
  223 + private String xqgczam;
  224 + //白蛋白
  225 + private String albumin;
  226 + //总胆红素
  227 + private String totalBilirubin;
  228 + //结合胆红素
  229 + private String jhBilirubin;
257 230  
  231 + //丙肝
  232 + private String bg;
  233 + // 乙肝表面抗原
  234 + private String ygbmky;
  235 + //乙肝表面抗体
  236 + private String ygbmkt;
  237 + //乙肝e抗原
  238 + private String ygeky;
  239 + // 乙肝e抗体
  240 + private String ygekt;
  241 + // 乙肝核心抗体
  242 + private String yghxkt;
  243 +
  244 + //血清肌
  245 + private String xqjq;
  246 + //血尿素氮
  247 + private String xnsd;
  248 +
  249 + //实验结果
  250 + private String syjg;
  251 +
  252 + //hit抗体检测
  253 + private String hivkt;
  254 +
  255 +
258 256 public String getVcCardNo() {
259 257 return vcCardNo;
260 258 }
... ... @@ -265,6 +263,199 @@
265 263  
266 264 /**承德区域功能*****/
267 265  
  266 + public String getBxbjs() {
  267 + return bxbjs;
  268 + }
  269 +
  270 + public void setBxbjs(String bxbjs) {
  271 + this.bxbjs = bxbjs;
  272 + }
  273 +
  274 + public String getPlatelet() {
  275 + return platelet;
  276 + }
  277 +
  278 + public void setPlatelet(String platelet) {
  279 + this.platelet = platelet;
  280 + }
  281 +
  282 + public String getChgOther() {
  283 + return chgOther;
  284 + }
  285 +
  286 + public void setChgOther(String chgOther) {
  287 + this.chgOther = chgOther;
  288 + }
  289 +
  290 + public String getNt() {
  291 + return nt;
  292 + }
  293 +
  294 + public void setNt(String nt) {
  295 + this.nt = nt;
  296 + }
  297 +
  298 + public String getUrineKetone() {
  299 + return urineKetone;
  300 + }
  301 +
  302 + public void setUrineKetone(String urineKetone) {
  303 + this.urineKetone = urineKetone;
  304 + }
  305 +
  306 + public String getBld() {
  307 + return bld;
  308 + }
  309 +
  310 + public void setBld(String bld) {
  311 + this.bld = bld;
  312 + }
  313 +
  314 + public String getNcgOther() {
  315 + return ncgOther;
  316 + }
  317 +
  318 + public void setNcgOther(String ncgOther) {
  319 + this.ncgOther = ncgOther;
  320 + }
  321 +
  322 + public String getAbo() {
  323 + return abo;
  324 + }
  325 +
  326 + public void setAbo(String abo) {
  327 + this.abo = abo;
  328 + }
  329 +
  330 + public String getRh() {
  331 + return rh;
  332 + }
  333 +
  334 + public void setRh(String rh) {
  335 + this.rh = rh;
  336 + }
  337 +
  338 + public String getXqgbzam() {
  339 + return xqgbzam;
  340 + }
  341 +
  342 + public void setXqgbzam(String xqgbzam) {
  343 + this.xqgbzam = xqgbzam;
  344 + }
  345 +
  346 + public String getXqgczam() {
  347 + return xqgczam;
  348 + }
  349 +
  350 + public void setXqgczam(String xqgczam) {
  351 + this.xqgczam = xqgczam;
  352 + }
  353 +
  354 + public String getAlbumin() {
  355 + return albumin;
  356 + }
  357 +
  358 + public void setAlbumin(String albumin) {
  359 + this.albumin = albumin;
  360 + }
  361 +
  362 + public String getTotalBilirubin() {
  363 + return totalBilirubin;
  364 + }
  365 +
  366 + public void setTotalBilirubin(String totalBilirubin) {
  367 + this.totalBilirubin = totalBilirubin;
  368 + }
  369 +
  370 + public String getJhBilirubin() {
  371 + return jhBilirubin;
  372 + }
  373 +
  374 + public void setJhBilirubin(String jhBilirubin) {
  375 + this.jhBilirubin = jhBilirubin;
  376 + }
  377 +
  378 + public String getBg() {
  379 + return bg;
  380 + }
  381 +
  382 + public void setBg(String bg) {
  383 + this.bg = bg;
  384 + }
  385 +
  386 + public String getYgbmky() {
  387 + return ygbmky;
  388 + }
  389 +
  390 + public void setYgbmky(String ygbmky) {
  391 + this.ygbmky = ygbmky;
  392 + }
  393 +
  394 + public String getYgbmkt() {
  395 + return ygbmkt;
  396 + }
  397 +
  398 + public void setYgbmkt(String ygbmkt) {
  399 + this.ygbmkt = ygbmkt;
  400 + }
  401 +
  402 + public String getYgeky() {
  403 + return ygeky;
  404 + }
  405 +
  406 + public void setYgeky(String ygeky) {
  407 + this.ygeky = ygeky;
  408 + }
  409 +
  410 + public String getYgekt() {
  411 + return ygekt;
  412 + }
  413 +
  414 + public void setYgekt(String ygekt) {
  415 + this.ygekt = ygekt;
  416 + }
  417 +
  418 + public String getYghxkt() {
  419 + return yghxkt;
  420 + }
  421 +
  422 + public void setYghxkt(String yghxkt) {
  423 + this.yghxkt = yghxkt;
  424 + }
  425 +
  426 + public String getXqjq() {
  427 + return xqjq;
  428 + }
  429 +
  430 + public void setXqjq(String xqjq) {
  431 + this.xqjq = xqjq;
  432 + }
  433 +
  434 + public String getXnsd() {
  435 + return xnsd;
  436 + }
  437 +
  438 + public void setXnsd(String xnsd) {
  439 + this.xnsd = xnsd;
  440 + }
  441 +
  442 + public String getSyjg() {
  443 + return syjg;
  444 + }
  445 +
  446 + public void setSyjg(String syjg) {
  447 + this.syjg = syjg;
  448 + }
  449 +
  450 + public String getHivkt() {
  451 + return hivkt;
  452 + }
  453 +
  454 + public void setHivkt(String hivkt) {
  455 + this.hivkt = hivkt;
  456 + }
  457 +
  458 +
268 459 public List<String> mHighRiskReason;
269 460  
270 461 public String getLisCheckItems() {
... ... @@ -782,6 +973,32 @@
782 973 }
783 974 examinationModel.setcDueWeek(cDueWeek);
784 975 examinationModel.setRandomBloodSugar(randomBloodSugar);
  976 +
  977 + examinationModel.setBxbjs(bxbjs);
  978 + examinationModel.setPlatelet(platelet);
  979 + examinationModel.setChgOther(chgOther);
  980 + examinationModel.setNt(nt);
  981 + examinationModel.setUrineKetone(urineKetone);
  982 + examinationModel.setBld(bld);
  983 + examinationModel.setNcgOther(ncgOther);
  984 + examinationModel.setAbo(abo);
  985 + examinationModel.setRh(rh);
  986 + examinationModel.setXqgbzam(xqgbzam);
  987 + examinationModel.setXqgczam(xqgczam);
  988 + examinationModel.setAlbumin(albumin);
  989 + examinationModel.setTotalBilirubin(totalBilirubin);
  990 + examinationModel.setJhBilirubin(jhBilirubin);
  991 + examinationModel.setBg(bg);
  992 + examinationModel.setYgbmky(ygbmky);
  993 + examinationModel.setYgbmkt(ygbmkt);
  994 + examinationModel.setYgeky(ygeky);
  995 + examinationModel.setYgekt(ygekt);
  996 + examinationModel.setYghxkt(yghxkt);
  997 + examinationModel.setXqjq(xqjq);
  998 + examinationModel.setXnsd(xnsd);
  999 + examinationModel.setSyjg(syjg);
  1000 + examinationModel.setHivkt(hivkt);
  1001 +
785 1002 return examinationModel;
786 1003 }
787 1004  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 25230f5
... ... @@ -278,6 +278,261 @@
278 278 //心电图
279 279 public String electr;
280 280  
  281 +
  282 +
  283 + /**承德区域功能*****/
  284 +
  285 +
  286 + //血红蛋白值
  287 + //private String xhdb;
  288 + //白细胞计数值
  289 + private String bxbjs;
  290 + // 血小板
  291 + private String platelet;
  292 + //血常规其他
  293 + private String chgOther;
  294 + //尿蛋白
  295 + //private String ndb;
  296 + //尿糖
  297 + private String nt;
  298 + //尿同体
  299 + private String urineKetone;
  300 + //尿潜血
  301 + private String bld;
  302 + //尿常规其他
  303 + private String ncgOther;
  304 + //血型
  305 + private String abo;
  306 + //RH血型
  307 + private String rh;
  308 +
  309 + //血清谷丙转氨酶
  310 + private String xqgbzam;
  311 + //血清谷草转氨酶
  312 + private String xqgczam;
  313 + //白蛋白
  314 + private String albumin;
  315 + //总胆红素
  316 + private String totalBilirubin;
  317 + //结合胆红素
  318 + private String jhBilirubin;
  319 +
  320 + //丙肝
  321 + private String bg;
  322 + // 乙肝表面抗原
  323 + private String ygbmky;
  324 + //乙肝表面抗体
  325 + private String ygbmkt;
  326 + //乙肝e抗原
  327 + private String ygeky;
  328 + // 乙肝e抗体
  329 + private String ygekt;
  330 + // 乙肝核心抗体
  331 + private String yghxkt;
  332 +
  333 + //血清肌
  334 + private String xqjq;
  335 + //血尿素氮
  336 + private String xnsd;
  337 +
  338 + //实验结果
  339 + private String syjg;
  340 +
  341 + //hit抗体检测
  342 + private String hivkt;
  343 +
  344 + public String getBxbjs() {
  345 + return bxbjs;
  346 + }
  347 +
  348 + public void setBxbjs(String bxbjs) {
  349 + this.bxbjs = bxbjs;
  350 + }
  351 +
  352 + public String getPlatelet() {
  353 + return platelet;
  354 + }
  355 +
  356 + public void setPlatelet(String platelet) {
  357 + this.platelet = platelet;
  358 + }
  359 +
  360 + public String getChgOther() {
  361 + return chgOther;
  362 + }
  363 +
  364 + public void setChgOther(String chgOther) {
  365 + this.chgOther = chgOther;
  366 + }
  367 +
  368 + public String getNt() {
  369 + return nt;
  370 + }
  371 +
  372 + public void setNt(String nt) {
  373 + this.nt = nt;
  374 + }
  375 +
  376 + public String getUrineKetone() {
  377 + return urineKetone;
  378 + }
  379 +
  380 + public void setUrineKetone(String urineKetone) {
  381 + this.urineKetone = urineKetone;
  382 + }
  383 +
  384 + public String getBld() {
  385 + return bld;
  386 + }
  387 +
  388 + public void setBld(String bld) {
  389 + this.bld = bld;
  390 + }
  391 +
  392 + public String getNcgOther() {
  393 + return ncgOther;
  394 + }
  395 +
  396 + public void setNcgOther(String ncgOther) {
  397 + this.ncgOther = ncgOther;
  398 + }
  399 +
  400 + public String getAbo() {
  401 + return abo;
  402 + }
  403 +
  404 + public void setAbo(String abo) {
  405 + this.abo = abo;
  406 + }
  407 +
  408 + public String getRh() {
  409 + return rh;
  410 + }
  411 +
  412 + public void setRh(String rh) {
  413 + this.rh = rh;
  414 + }
  415 +
  416 + public String getXqgbzam() {
  417 + return xqgbzam;
  418 + }
  419 +
  420 + public void setXqgbzam(String xqgbzam) {
  421 + this.xqgbzam = xqgbzam;
  422 + }
  423 +
  424 + public String getXqgczam() {
  425 + return xqgczam;
  426 + }
  427 +
  428 + public void setXqgczam(String xqgczam) {
  429 + this.xqgczam = xqgczam;
  430 + }
  431 +
  432 + public String getAlbumin() {
  433 + return albumin;
  434 + }
  435 +
  436 + public void setAlbumin(String albumin) {
  437 + this.albumin = albumin;
  438 + }
  439 +
  440 + public String getTotalBilirubin() {
  441 + return totalBilirubin;
  442 + }
  443 +
  444 + public void setTotalBilirubin(String totalBilirubin) {
  445 + this.totalBilirubin = totalBilirubin;
  446 + }
  447 +
  448 + public String getJhBilirubin() {
  449 + return jhBilirubin;
  450 + }
  451 +
  452 + public void setJhBilirubin(String jhBilirubin) {
  453 + this.jhBilirubin = jhBilirubin;
  454 + }
  455 +
  456 + public String getBg() {
  457 + return bg;
  458 + }
  459 +
  460 + public void setBg(String bg) {
  461 + this.bg = bg;
  462 + }
  463 +
  464 + public String getYgbmky() {
  465 + return ygbmky;
  466 + }
  467 +
  468 + public void setYgbmky(String ygbmky) {
  469 + this.ygbmky = ygbmky;
  470 + }
  471 +
  472 + public String getYgbmkt() {
  473 + return ygbmkt;
  474 + }
  475 +
  476 + public void setYgbmkt(String ygbmkt) {
  477 + this.ygbmkt = ygbmkt;
  478 + }
  479 +
  480 + public String getYgeky() {
  481 + return ygeky;
  482 + }
  483 +
  484 + public void setYgeky(String ygeky) {
  485 + this.ygeky = ygeky;
  486 + }
  487 +
  488 + public String getYgekt() {
  489 + return ygekt;
  490 + }
  491 +
  492 + public void setYgekt(String ygekt) {
  493 + this.ygekt = ygekt;
  494 + }
  495 +
  496 + public String getYghxkt() {
  497 + return yghxkt;
  498 + }
  499 +
  500 + public void setYghxkt(String yghxkt) {
  501 + this.yghxkt = yghxkt;
  502 + }
  503 +
  504 + public String getXqjq() {
  505 + return xqjq;
  506 + }
  507 +
  508 + public void setXqjq(String xqjq) {
  509 + this.xqjq = xqjq;
  510 + }
  511 +
  512 + public String getXnsd() {
  513 + return xnsd;
  514 + }
  515 +
  516 + public void setXnsd(String xnsd) {
  517 + this.xnsd = xnsd;
  518 + }
  519 +
  520 + public String getSyjg() {
  521 + return syjg;
  522 + }
  523 +
  524 + public void setSyjg(String syjg) {
  525 + this.syjg = syjg;
  526 + }
  527 +
  528 + public String getHivkt() {
  529 + return hivkt;
  530 + }
  531 +
  532 + public void setHivkt(String hivkt) {
  533 + this.hivkt = hivkt;
  534 + }
  535 +
281 536 public String getTtita() {
282 537 return ttita;
283 538 }
... ... @@ -695,6 +950,32 @@
695 950 setTypeYc(destModel.getTypeYc());
696 951 setLisCheckItems(destModel.getLisCheckItems());
697 952 setRandomBloodSugar(destModel.getRandomBloodSugar());
  953 +
  954 + setBxbjs(destModel.getBxbjs());
  955 + setPlatelet(destModel.getPlatelet());
  956 + setChgOther(destModel.getChgOther());
  957 + setNt(destModel.getNt());
  958 + setUrineKetone(destModel.getUrineKetone());
  959 + setBld(destModel.getBld());
  960 + setNcgOther(destModel.getNcgOther());
  961 + setAbo(destModel.getAbo());
  962 + setRh(destModel.getRh());
  963 + setXqgbzam(destModel.getXqgbzam());
  964 + setXqgczam(destModel.getXqgczam());
  965 + setAlbumin(destModel.getAlbumin());
  966 + setTotalBilirubin(destModel.getTotalBilirubin());
  967 + setJhBilirubin(destModel.getJhBilirubin());
  968 + setBg(destModel.getBg());
  969 + setYgbmky(destModel.getYgbmky());
  970 + setYgbmkt(destModel.getYgbmkt());
  971 + setYgeky(destModel.getYgeky());
  972 + setYgekt(destModel.getYgekt());
  973 + setYghxkt(destModel.getYghxkt());
  974 + setXqjq(destModel.getXqjq());
  975 + setXnsd(destModel.getXnsd());
  976 + setSyjg(destModel.getSyjg());
  977 + setHivkt(destModel.getHivkt());
  978 +
698 979 return this;
699 980 }
700 981