liquanyu / regional-platform

Download as
Browse Code »

Commit fff1785cdeb7ced8812164d856842d3b28496a1b

Authored by liquanyu
1 parent 3f28b4f962
Exists in master and in 1 other branch dev

update

Showing 3 changed files with 762 additions and 151 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsFm.java View file @ fff1785
  1 +package com.lyms.hospitalapi.hs;
  2 +
  3 +import java.util.Date;
  4 +
  5 +/**
  6 + * Created by Administrator on 2021-08-11.
  7 + */
  8 +public class HsFm {
  9 +
  10 + private String ID; //产妇档案ID
  11 + private String BHNUM; //住院号
  12 + private String VCCARDNO; //就诊卡号
  13 + private String NAME; //产妇姓名
  14 + private String PHONE; //手机号码
  15 + private String IDCARD; //身份证号
  16 + private String ADDR; //产妇居住地址
  17 + private String DUE_WEEK;//分娩孕周
  18 + private String DUE_DAY; //分娩孕周的多少天
  19 + private String FETUS_NUM;//胎数
  20 + private String PLACENTA_NUM;//胎盘数
  21 + private String DELIVERY_MODE;//分娩方式
  22 + private String DELIVERY_TYPE;
  23 + private String OPERATION_CAUSE;//手术原因
  24 + private String PROD_PROCESS_ONE;//第一产程
  25 + private String PROD_PROCESS_TWO;//第二产程
  26 + private String PROD_PROCESS_THREE;//第三产程
  27 + private String TOTAL_PROCESS; //总产程
  28 + private String PERINEAL_CONDITION; //会阴情况
  29 + private String CHBP; //产后血压
  30 + private String CH2BP; //产后两小时血压
  31 + private String BREATH; //呼吸
  32 + private String PULSE; //脉搏
  33 + private String SILIE_LEVEL; //撕裂等级
  34 + private String NEEDLE_NUM; //缝线针数
  35 + private String MATERNAL_INFO; //产妇情况
  36 + private String DEATH_CAUSE; //产妇死亡原因
  37 + private String OH_LOSE_BLOOD; //产后一小时失血量
  38 + private String TH_LOSE_BLOOD; //产后二小时失血量
  39 + private String RH_LOSE_BLOOD; //产后二十四小时失血量
  40 + private String SH_LOSE_BLOOD; //第三产程+产后失血量
  41 + private String LOSE_BLOOD_CAUSE; //失血原因
  42 + private String OCS; //产科并发症
  43 + private String DELIVER_HOSPITAL; //分娩医院
  44 + private String DELIVER_DOCTOR; //接生医生
  45 + private String BABY_FETAL_PRESENTATION; //胎先露（头|臀|足|肩）
  46 + private String BABY_FETAL_POSITION; //胎方位
  47 + private String BABY_SEX; //新生儿性别
  48 + private String BABY_DELIVERY_TIME; //新生儿娩出时间
  49 + private String BABY_PREGNANCY_OUT; //妊娠结局(活产|死胎|浸软胎|死产)
  50 + private String BABY_APGAR_SCORE_ONE; //APGAR评分 1分钟
  51 + private String BABY_APGAR_SCORE_FIVE;//APGAR评分 5分钟
  52 + private String BABY_APGAR_SCORE_TEN; //APGAR评分 10分钟
  53 + private String BABY_SICK; //新生儿疾病
  54 + private String BABY_TOUCH_STARTM; //母婴接触开始时间
  55 + private String BABY_TOUCH_LASTM; //母婴接触持续时间
  56 + private String BABY_WEIGHT; //新生儿重量
  57 + private String BABY_HEIGHT; //新生儿身长
  58 + private String BABY_DEFORMITY; //畸形（非畸形 | 畸形）
  59 + private String UM_EXTYPE; //脐带异常类型(脐带过长| 脐带过短|脐带缠绕| 脐带打结|脐带扭转| 脐带脱垂|)
  60 + private String TMCTYPE; //胎盘娩出方式(自然娩出|手术娩出)
  61 + private String TMCSIDE; //娩出方式(子面 | 母面)
  62 + private String TLONG; //胎盘长
  63 + private String TWIDTH; //胎盘宽
  64 + private String THEIGHT; //胎盘厚度
  65 + private String TWEIGHT; //胎盘重量
  66 + private String UM_LENGTH; //脐带长度
  67 + private Date MODIFIED; //修改时间
  68 + private Date CREATED; //创建时间
  69 +
  70 + private String babyDate;//接收孕妇分娩最近日期
  71 +
  72 + public String getBREATH() {
  73 + return BREATH;
  74 + }
  75 +
  76 + public void setBREATH(String BREATH) {
  77 + this.BREATH = BREATH;
  78 + }
  79 +
  80 + public String getPULSE() {
  81 + return PULSE;
  82 + }
  83 +
  84 + public void setPULSE(String PULSE) {
  85 + this.PULSE = PULSE;
  86 + }
  87 +
  88 + public String getBABY_APGAR_SCORE_ONE() {
  89 + return BABY_APGAR_SCORE_ONE;
  90 + }
  91 +
  92 + public void setBABY_APGAR_SCORE_ONE(String BABY_APGAR_SCORE_ONE) {
  93 + this.BABY_APGAR_SCORE_ONE = BABY_APGAR_SCORE_ONE;
  94 + }
  95 +
  96 + public String getBABY_APGAR_SCORE_FIVE() {
  97 + return BABY_APGAR_SCORE_FIVE;
  98 + }
  99 +
  100 + public void setBABY_APGAR_SCORE_FIVE(String BABY_APGAR_SCORE_FIVE) {
  101 + this.BABY_APGAR_SCORE_FIVE = BABY_APGAR_SCORE_FIVE;
  102 + }
  103 +
  104 + public String getBABY_APGAR_SCORE_TEN() {
  105 + return BABY_APGAR_SCORE_TEN;
  106 + }
  107 +
  108 + public void setBABY_APGAR_SCORE_TEN(String BABY_APGAR_SCORE_TEN) {
  109 + this.BABY_APGAR_SCORE_TEN = BABY_APGAR_SCORE_TEN;
  110 + }
  111 +
  112 + public String getBABY_SICK() {
  113 + return BABY_SICK;
  114 + }
  115 +
  116 + public void setBABY_SICK(String BABY_SICK) {
  117 + this.BABY_SICK = BABY_SICK;
  118 + }
  119 +
  120 + public String getBABY_TOUCH_STARTM() {
  121 + return BABY_TOUCH_STARTM;
  122 + }
  123 +
  124 + public void setBABY_TOUCH_STARTM(String BABY_TOUCH_STARTM) {
  125 + this.BABY_TOUCH_STARTM = BABY_TOUCH_STARTM;
  126 + }
  127 +
  128 + public String getBABY_TOUCH_LASTM() {
  129 + return BABY_TOUCH_LASTM;
  130 + }
  131 +
  132 + public void setBABY_TOUCH_LASTM(String BABY_TOUCH_LASTM) {
  133 + this.BABY_TOUCH_LASTM = BABY_TOUCH_LASTM;
  134 + }
  135 +
  136 + public String getUM_EXTYPE() {
  137 + return UM_EXTYPE;
  138 + }
  139 +
  140 + public void setUM_EXTYPE(String UM_EXTYPE) {
  141 + this.UM_EXTYPE = UM_EXTYPE;
  142 + }
  143 +
  144 + public String getCH2BP() {
  145 + return CH2BP;
  146 + }
  147 +
  148 + public void setCH2BP(String CH2BP) {
  149 + this.CH2BP = CH2BP;
  150 + }
  151 +
  152 + public String getCHBP() {
  153 + return CHBP;
  154 + }
  155 +
  156 + public void setCHBP(String CHBP) {
  157 + this.CHBP = CHBP;
  158 + }
  159 +
  160 + public String getID() {
  161 + return ID;
  162 + }
  163 +
  164 + public void setID(String ID) {
  165 + this.ID = ID;
  166 + }
  167 +
  168 + public String getBHNUM() {
  169 + return BHNUM;
  170 + }
  171 +
  172 + public void setBHNUM(String BHNUM) {
  173 + this.BHNUM = BHNUM;
  174 + }
  175 +
  176 + public String getVCCARDNO() {
  177 + return VCCARDNO;
  178 + }
  179 +
  180 + public void setVCCARDNO(String VCCARDNO) {
  181 + this.VCCARDNO = VCCARDNO;
  182 + }
  183 +
  184 + public String getNAME() {
  185 + return NAME;
  186 + }
  187 +
  188 + public void setNAME(String NAME) {
  189 + this.NAME = NAME;
  190 + }
  191 +
  192 + public String getPHONE() {
  193 + return PHONE;
  194 + }
  195 +
  196 + public void setPHONE(String PHONE) {
  197 + this.PHONE = PHONE;
  198 + }
  199 +
  200 + public String getIDCARD() {
  201 + return IDCARD;
  202 + }
  203 +
  204 + public void setIDCARD(String IDCARD) {
  205 + this.IDCARD = IDCARD;
  206 + }
  207 +
  208 + public String getADDR() {
  209 + return ADDR;
  210 + }
  211 +
  212 + public void setADDR(String ADDR) {
  213 + this.ADDR = ADDR;
  214 + }
  215 +
  216 + public String getDUE_WEEK() {
  217 + return DUE_WEEK;
  218 + }
  219 +
  220 + public void setDUE_WEEK(String DUE_WEEK) {
  221 + this.DUE_WEEK = DUE_WEEK;
  222 + }
  223 +
  224 + public String getDUE_DAY() {
  225 + return DUE_DAY;
  226 + }
  227 +
  228 + public void setDUE_DAY(String DUE_DAY) {
  229 + this.DUE_DAY = DUE_DAY;
  230 + }
  231 +
  232 + public String getFETUS_NUM() {
  233 + return FETUS_NUM;
  234 + }
  235 +
  236 + public void setFETUS_NUM(String FETUS_NUM) {
  237 + this.FETUS_NUM = FETUS_NUM;
  238 + }
  239 +
  240 + public String getPLACENTA_NUM() {
  241 + return PLACENTA_NUM;
  242 + }
  243 +
  244 + public void setPLACENTA_NUM(String PLACENTA_NUM) {
  245 + this.PLACENTA_NUM = PLACENTA_NUM;
  246 + }
  247 +
  248 + public String getDELIVERY_MODE() {
  249 + return DELIVERY_MODE;
  250 + }
  251 +
  252 + public void setDELIVERY_MODE(String DELIVERY_MODE) {
  253 + this.DELIVERY_MODE = DELIVERY_MODE;
  254 + }
  255 +
  256 + public String getDELIVERY_TYPE() {
  257 + return DELIVERY_TYPE;
  258 + }
  259 +
  260 + public void setDELIVERY_TYPE(String DELIVERY_TYPE) {
  261 + this.DELIVERY_TYPE = DELIVERY_TYPE;
  262 + }
  263 +
  264 + public String getOPERATION_CAUSE() {
  265 + return OPERATION_CAUSE;
  266 + }
  267 +
  268 + public void setOPERATION_CAUSE(String OPERATION_CAUSE) {
  269 + this.OPERATION_CAUSE = OPERATION_CAUSE;
  270 + }
  271 +
  272 + public String getPROD_PROCESS_ONE() {
  273 + return PROD_PROCESS_ONE;
  274 + }
  275 +
  276 + public void setPROD_PROCESS_ONE(String PROD_PROCESS_ONE) {
  277 + this.PROD_PROCESS_ONE = PROD_PROCESS_ONE;
  278 + }
  279 +
  280 + public String getPROD_PROCESS_TWO() {
  281 + return PROD_PROCESS_TWO;
  282 + }
  283 +
  284 + public void setPROD_PROCESS_TWO(String PROD_PROCESS_TWO) {
  285 + this.PROD_PROCESS_TWO = PROD_PROCESS_TWO;
  286 + }
  287 +
  288 + public String getPROD_PROCESS_THREE() {
  289 + return PROD_PROCESS_THREE;
  290 + }
  291 +
  292 + public void setPROD_PROCESS_THREE(String PROD_PROCESS_THREE) {
  293 + this.PROD_PROCESS_THREE = PROD_PROCESS_THREE;
  294 + }
  295 +
  296 + public String getTOTAL_PROCESS() {
  297 + return TOTAL_PROCESS;
  298 + }
  299 +
  300 + public void setTOTAL_PROCESS(String TOTAL_PROCESS) {
  301 + this.TOTAL_PROCESS = TOTAL_PROCESS;
  302 + }
  303 +
  304 + public String getPERINEAL_CONDITION() {
  305 + return PERINEAL_CONDITION;
  306 + }
  307 +
  308 + public void setPERINEAL_CONDITION(String PERINEAL_CONDITION) {
  309 + this.PERINEAL_CONDITION = PERINEAL_CONDITION;
  310 + }
  311 +
  312 + public String getSILIE_LEVEL() {
  313 + return SILIE_LEVEL;
  314 + }
  315 +
  316 + public void setSILIE_LEVEL(String SILIE_LEVEL) {
  317 + this.SILIE_LEVEL = SILIE_LEVEL;
  318 + }
  319 +
  320 + public String getNEEDLE_NUM() {
  321 + return NEEDLE_NUM;
  322 + }
  323 +
  324 + public void setNEEDLE_NUM(String NEEDLE_NUM) {
  325 + this.NEEDLE_NUM = NEEDLE_NUM;
  326 + }
  327 +
  328 + public String getMATERNAL_INFO() {
  329 + return MATERNAL_INFO;
  330 + }
  331 +
  332 + public void setMATERNAL_INFO(String MATERNAL_INFO) {
  333 + this.MATERNAL_INFO = MATERNAL_INFO;
  334 + }
  335 +
  336 + public String getDEATH_CAUSE() {
  337 + return DEATH_CAUSE;
  338 + }
  339 +
  340 + public void setDEATH_CAUSE(String DEATH_CAUSE) {
  341 + this.DEATH_CAUSE = DEATH_CAUSE;
  342 + }
  343 +
  344 + public String getOH_LOSE_BLOOD() {
  345 + return OH_LOSE_BLOOD;
  346 + }
  347 +
  348 + public void setOH_LOSE_BLOOD(String OH_LOSE_BLOOD) {
  349 + this.OH_LOSE_BLOOD = OH_LOSE_BLOOD;
  350 + }
  351 +
  352 + public String getTH_LOSE_BLOOD() {
  353 + return TH_LOSE_BLOOD;
  354 + }
  355 +
  356 + public void setTH_LOSE_BLOOD(String TH_LOSE_BLOOD) {
  357 + this.TH_LOSE_BLOOD = TH_LOSE_BLOOD;
  358 + }
  359 +
  360 + public String getRH_LOSE_BLOOD() {
  361 + return RH_LOSE_BLOOD;
  362 + }
  363 +
  364 + public void setRH_LOSE_BLOOD(String RH_LOSE_BLOOD) {
  365 + this.RH_LOSE_BLOOD = RH_LOSE_BLOOD;
  366 + }
  367 +
  368 + public String getSH_LOSE_BLOOD() {
  369 + return SH_LOSE_BLOOD;
  370 + }
  371 +
  372 + public void setSH_LOSE_BLOOD(String SH_LOSE_BLOOD) {
  373 + this.SH_LOSE_BLOOD = SH_LOSE_BLOOD;
  374 + }
  375 +
  376 + public String getLOSE_BLOOD_CAUSE() {
  377 + return LOSE_BLOOD_CAUSE;
  378 + }
  379 +
  380 + public void setLOSE_BLOOD_CAUSE(String LOSE_BLOOD_CAUSE) {
  381 + this.LOSE_BLOOD_CAUSE = LOSE_BLOOD_CAUSE;
  382 + }
  383 +
  384 + public String getOCS() {
  385 + return OCS;
  386 + }
  387 +
  388 + public void setOCS(String OCS) {
  389 + this.OCS = OCS;
  390 + }
  391 +
  392 + public String getDELIVER_HOSPITAL() {
  393 + return DELIVER_HOSPITAL;
  394 + }
  395 +
  396 + public void setDELIVER_HOSPITAL(String DELIVER_HOSPITAL) {
  397 + this.DELIVER_HOSPITAL = DELIVER_HOSPITAL;
  398 + }
  399 +
  400 + public String getDELIVER_DOCTOR() {
  401 + return DELIVER_DOCTOR;
  402 + }
  403 +
  404 + public void setDELIVER_DOCTOR(String DELIVER_DOCTOR) {
  405 + this.DELIVER_DOCTOR = DELIVER_DOCTOR;
  406 + }
  407 +
  408 + public String getBABY_FETAL_PRESENTATION() {
  409 + return BABY_FETAL_PRESENTATION;
  410 + }
  411 +
  412 + public void setBABY_FETAL_PRESENTATION(String BABY_FETAL_PRESENTATION) {
  413 + this.BABY_FETAL_PRESENTATION = BABY_FETAL_PRESENTATION;
  414 + }
  415 +
  416 + public String getBABY_FETAL_POSITION() {
  417 + return BABY_FETAL_POSITION;
  418 + }
  419 +
  420 + public void setBABY_FETAL_POSITION(String BABY_FETAL_POSITION) {
  421 + this.BABY_FETAL_POSITION = BABY_FETAL_POSITION;
  422 + }
  423 +
  424 + public String getBABY_SEX() {
  425 + return BABY_SEX;
  426 + }
  427 +
  428 + public void setBABY_SEX(String BABY_SEX) {
  429 + this.BABY_SEX = BABY_SEX;
  430 + }
  431 +
  432 + public String getBABY_DELIVERY_TIME() {
  433 + return BABY_DELIVERY_TIME;
  434 + }
  435 +
  436 + public void setBABY_DELIVERY_TIME(String BABY_DELIVERY_TIME) {
  437 + this.BABY_DELIVERY_TIME = BABY_DELIVERY_TIME;
  438 + }
  439 +
  440 + public String getBABY_PREGNANCY_OUT() {
  441 + return BABY_PREGNANCY_OUT;
  442 + }
  443 +
  444 + public void setBABY_PREGNANCY_OUT(String BABY_PREGNANCY_OUT) {
  445 + this.BABY_PREGNANCY_OUT = BABY_PREGNANCY_OUT;
  446 + }
  447 +
  448 + public String getBABY_WEIGHT() {
  449 + return BABY_WEIGHT;
  450 + }
  451 +
  452 + public void setBABY_WEIGHT(String BABY_WEIGHT) {
  453 + this.BABY_WEIGHT = BABY_WEIGHT;
  454 + }
  455 +
  456 + public String getBABY_HEIGHT() {
  457 + return BABY_HEIGHT;
  458 + }
  459 +
  460 + public void setBABY_HEIGHT(String BABY_HEIGHT) {
  461 + this.BABY_HEIGHT = BABY_HEIGHT;
  462 + }
  463 +
  464 + public String getBABY_DEFORMITY() {
  465 + return BABY_DEFORMITY;
  466 + }
  467 +
  468 + public void setBABY_DEFORMITY(String BABY_DEFORMITY) {
  469 + this.BABY_DEFORMITY = BABY_DEFORMITY;
  470 + }
  471 +
  472 + public String getTMCTYPE() {
  473 + return TMCTYPE;
  474 + }
  475 +
  476 + public void setTMCTYPE(String TMCTYPE) {
  477 + this.TMCTYPE = TMCTYPE;
  478 + }
  479 +
  480 + public String getTMCSIDE() {
  481 + return TMCSIDE;
  482 + }
  483 +
  484 + public void setTMCSIDE(String TMCSIDE) {
  485 + this.TMCSIDE = TMCSIDE;
  486 + }
  487 +
  488 + public String getTLONG() {
  489 + return TLONG;
  490 + }
  491 +
  492 + public void setTLONG(String TLONG) {
  493 + this.TLONG = TLONG;
  494 + }
  495 +
  496 + public String getTWIDTH() {
  497 + return TWIDTH;
  498 + }
  499 +
  500 + public void setTWIDTH(String TWIDTH) {
  501 + this.TWIDTH = TWIDTH;
  502 + }
  503 +
  504 + public String getTHEIGHT() {
  505 + return THEIGHT;
  506 + }
  507 +
  508 + public void setTHEIGHT(String THEIGHT) {
  509 + this.THEIGHT = THEIGHT;
  510 + }
  511 +
  512 + public String getTWEIGHT() {
  513 + return TWEIGHT;
  514 + }
  515 +
  516 + public void setTWEIGHT(String TWEIGHT) {
  517 + this.TWEIGHT = TWEIGHT;
  518 + }
  519 +
  520 + public String getUM_LENGTH() {
  521 + return UM_LENGTH;
  522 + }
  523 +
  524 + public void setUM_LENGTH(String UM_LENGTH) {
  525 + this.UM_LENGTH = UM_LENGTH;
  526 + }
  527 +
  528 + public Date getMODIFIED() {
  529 + return MODIFIED;
  530 + }
  531 +
  532 + public void setMODIFIED(Date MODIFIED) {
  533 + this.MODIFIED = MODIFIED;
  534 + }
  535 +
  536 + public Date getCREATED() {
  537 + return CREATED;
  538 + }
  539 +
  540 + public void setCREATED(Date CREATED) {
  541 + this.CREATED = CREATED;
  542 + }
  543 +
  544 + public String getBabyDate() {
  545 + return babyDate;
  546 + }
  547 +
  548 + public void setBabyDate(String babyDate) {
  549 + this.babyDate = babyDate;
  550 + }
  551 +}
platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java View file @ fff1785
1 1 package com.lyms.hospitalapi.hs;
2 2  
3   -import com.lyms.hospitalapi.dzfy.DzfyHisService;
4   -import com.lyms.hospitalapi.dzfy.Fm;
  3 +
  4 +import com.lyms.hospitalapi.hs.HsFm;
5 5 import com.lyms.hospitalapi.qhdfy.FmItem;
6 6 import com.lyms.platform.biz.service.PatientsService;
7   -import com.lyms.platform.common.enums.FmTypeEnums;
8   -import com.lyms.platform.common.enums.RenShenJieJuEnums;
9   -import com.lyms.platform.common.enums.TpmcTypeEnums;
10   -import com.lyms.platform.common.enums.YnEnums;
  7 +import com.lyms.platform.common.enums.*;
11 8 import com.lyms.platform.common.utils.DateUtil;
12 9 import com.lyms.platform.common.utils.ExceptionUtils;
13 10 import com.lyms.platform.common.utils.StringUtils;
14 11  
... ... @@ -119,44 +116,54 @@
119 116  
120 117 public void queryFmPatient(String start,String end,String phone) {
121 118  
122   - String cloumns = " ID as ID, " +
123   - " BHNUM as BHNUM, " +
124   - " VCCARDNO as VCCARDNO, " +
125   - " PHONE as PHONE, " +
126   - " NAME as NAME, " +
127   - " IDCARD as IDCARD, " +
128   - " CREATED as CREATED, " +
129   - " BABY_DELIVERY_TIME as BABY_DELIVERY_TIME, " +
130   - " BABY_SEX as BABY_SEX, " +
131   - " DUE_WEEK as DUE_WEEK, " +
132   - " DUE_DAY as DUE_DAY, " +
133   - " FETUS_NUM as FETUS_NUM, " +
134   -// " BABY_ASPHYXIAM as BABY_ASPHYXIAM, " +
135   - " BABY_WEIGHT as BABY_WEIGHT, " +
136   - " BABY_HEIGHT as BABY_HEIGHT, " +
137   -// " BABY_APGAR_SCORE_ONE as BABY_APGAR_SCORE_ONE, " +
138   -// " BABY_APGAR_SCORE_FIVE as BABY_APGAR_SCORE_FIVE, " +
139   -// " BABY_APGAR_SCORE_TEN as BABY_APGAR_SCORE_TEN, " +
140   - " BABY_PREGNANCY_OUT as BABY_PREGNANCY_OUT, " +
141   - " DELIVERY_MODE as DELIVERY_MODE, "+
142   -// " TMCSIDE as TMCSIDE, " +
143   -// " TMCTYPE as TMCTYPE, " +
144   -// " MATERNAL_INFO as MATERNAL_INFO, " +
145   - " PERINEAL_CONDITION as PERINEAL_CONDITION, " +
146   -// " SH_LOSE_BLOOD as SH_LOSE_BLOOD, " +
147   -// " TH_LOSE_BLOOD as TH_LOSE_BLOOD, " +
148   -// " DELIVER_DOCTOR as DELIVER_DOCTOR, " +
149   -// " PROD_PROCESS_ONE as PROD_PROCESS_ONE, " +
150   -// " PROD_PROCESS_TWO as PROD_PROCESS_TWO," +
151   -// " PROD_PROCESS_THREE as PROD_PROCESS_THREE, " +
152   -// " TOTAL_PROCESS as TOTAL_PROCESS, " +
153   - " OH_LOSE_BLOOD as OH_LOSE_BLOOD, " +
154   - " TH_LOSE_BLOOD as TH_LOSE_BLOOD, " +
155   - " PLACENTA_NUM as PLACENTA_NUM, " +
156   - " DELIVER_HOSPITAL as DELIVER_HOSPITAL, " +
157   - " DELIVER_DOCTOR as DELIVER_DOCTOR ";
  119 + String cloumns = " ID , " +
  120 + "BHNUM, " +
  121 + "PHONE, " +
  122 + "NAME, " +
  123 + "IDCARD, " +
  124 + "CREATED , " +
  125 + "BABY_DELIVERY_TIME , " +
  126 + "BABY_SEX, " +
  127 + "DUE_WEEK , " +
  128 + "DUE_DAY, " +
  129 + "FETUS_NUM , " +
  130 + "BABY_WEIGHT, " +
  131 + "BABY_HEIGHT, " +
  132 + "BABY_PREGNANCY_OUT, " +
  133 + "DELIVERY_MODE, "+
  134 + "DELIVERY_TYPE, "+
  135 + "OPERATION_CAUSE, "+
  136 + "SILIE_LEVEL, "+
  137 + "CHBP, "+
  138 + "CH2BP, "+
  139 + "NEEDLE_NUM , "+
  140 + "TMCSIDE, " +
  141 + "BREATH, " +
  142 + "PULSE, " +
  143 + "TLONG , " +
  144 + "TWIDTH , " +
  145 + "THEIGHT, " +
  146 + "TWEIGHT, " +
  147 + "UM_LENGTH, " +
  148 + "PERINEAL_CONDITION , " +
  149 + "BABY_APGAR_SCORE_ONE," +
  150 + "BABY_APGAR_SCORE_FIVE, " +
  151 + "BABY_APGAR_SCORE_TEN," +
  152 + "BABY_TOUCH_STARTM," +
  153 + "BABY_TOUCH_LASTM," +
  154 + "UM_EXTYPE," +
  155 + "OH_LOSE_BLOOD, " +
  156 + "TH_LOSE_BLOOD , " +
  157 + "PLACENTA_NUM , " +
  158 + "DELIVER_HOSPITAL, " +
  159 + "PROD_PROCESS_ONE, " +
  160 + "PROD_PROCESS_TWO, " +
  161 + "PROD_PROCESS_THREE, " +
  162 + "TOTAL_PROCESS, " +
  163 + "DELIVER_HOSPITAL, " +
  164 + "BABY_DEFORMITY, " +
  165 + "DELIVER_DOCTOR ";
158 166  
159   -
160 167 Connection conn = com.lyms.hospitalapi.hs.ConnTools.makeFmConnection();
161 168 QueryRunner queryRunner = new QueryRunner();
162 169 SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm");
163 170  
... ... @@ -169,12 +176,12 @@
169 176 sql+=" and IDCARD = '"+phone+"'";
170 177 }
171 178 ExceptionUtils.catchException("sql====" +sql);
172   - List<Fm> list = queryRunner.query(conn, sql, new BeanListHandler<Fm>(Fm.class));
  179 + List<HsFm> list = queryRunner.query(conn, sql, new BeanListHandler<HsFm>(HsFm.class));
173 180 ExceptionUtils.catchException("size====" + list.size());
174 181  
175 182 if(CollectionUtils.isNotEmpty(list)){
176 183  
177   - for(Fm fm:list){
  184 + for(HsFm fm:list){
178 185 System.out.println("fm=" + fm.toString());
179 186 int a = 0;//用来判断是否建了儿童档案，如果建了儿童档案就不保存分娩记录
180 187 int count = 0;
... ... @@ -185,7 +192,7 @@
185 192 String dateSql = "select max(CREATED) as babyDate from v_deliveryinfo where ID='"+id+"'" ;
186 193  
187 194 //获取到这个孕妇的最近的分娩日期
188   - List<Fm> dateList = queryRunner.query(conn, dateSql, new BeanListHandler<Fm>(Fm.class));
  195 + List<HsFm> dateList = queryRunner.query(conn, dateSql, new BeanListHandler<HsFm>(HsFm.class));
189 196 Calendar calendar = Calendar.getInstance();
190 197 calendar.setTime(fmt.parse(dateList.get(0).getBabyDate()));
191 198 calendar.add(Calendar.DAY_OF_MONTH, -1);
192 199  
... ... @@ -201,12 +208,12 @@
201 208 ExceptionUtils.catchException("allSql====" + allSql);
202 209  
203 210 //查出这个ID对应孕妇在这个时间段的分娩记录
204   - List<Fm> allList = queryRunner.query(conn, allSql, new BeanListHandler<Fm>(Fm.class));
  211 + List<HsFm> allList = queryRunner.query(conn, allSql, new BeanListHandler<HsFm>(HsFm.class));
205 212  
206 213 Date dueDate = null;
207 214 List<MatDeliverAddRequest.Baby> babies = new ArrayList<>();
208 215 MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest();
209   - for(Fm allFm:allList){
  216 + for(HsFm allFm:allList){
210 217  
211 218 if ("死胎".equals(allFm.getBABY_PREGNANCY_OUT()))
212 219 {
213 220  
... ... @@ -251,49 +258,10 @@
251 258 }else{
252 259 continue;
253 260 }
  261 + deliverAddRequest.setOperationCause(allFm.getOPERATION_CAUSE());
254 262  
255   - Map<String, Map<String,String>> map = new HashMap<>();
256   - Map<String, String> map1 = new HashMap<>();
257   - Map<String, String> map2 = new HashMap<>();
258   - Map<String, String> map3 = new HashMap<>();
259   - Map<String, String> totalMap = new HashMap<>();
260   -
261   - Integer prod_Process_One = allFm.getPROD_PROCESS_ONE();
262   - Integer prod_Process_Two = allFm.getPROD_PROCESS_TWO();
263   - Integer prod_Process_Three = allFm.getPROD_PROCESS_THREE();
264   - if(prod_Process_One!=null){
265   - map1.put("h",String.valueOf(prod_Process_One.intValue()/60));
266   - map1.put("m",String.valueOf(prod_Process_One.intValue()%60));
267   - map.put("one", map1);
268   - }
269   - if(prod_Process_Two!=null){
270   - map2.put("h",String.valueOf(prod_Process_Two.intValue()/60));
271   - map2.put("m",String.valueOf(prod_Process_Two.intValue()%60));
272   - map.put("two",map2);
273   - }
274   - if(prod_Process_Three!=null){
275   - map3.put("h",String.valueOf(prod_Process_Three.intValue()/60));
276   - map3.put("m",String.valueOf(prod_Process_Three.intValue()%60));
277   - map.put("three",map3);
278   - }
279   - if(StringUtils.isNotEmpty(allFm.getTOTAL_PROCESS())){
280   - int hProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())/60;//总产程小时数
281   - totalMap.put("h",String.valueOf(hProcess));
282   - }
283   - if(StringUtils.isNotEmpty(allFm.getTOTAL_PROCESS())){
284   - int mProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())%60;//总产程分钟数
285   - totalMap.put("m",String.valueOf(mProcess));
286   - }
287   -// // 一小时失血量
288   -// private Double oHloseBloodL;
289   -// //二小时失血量
290   -// private Double tHloseBloodL;
291   -
292   - deliverAddRequest.setoHloseBloodL(allFm.getOH_LOSE_BLOOD() == null ? (double)allFm.getOH_LOSE_BLOOD() : null);
293   - deliverAddRequest.settHloseBloodL(allFm.getTH_LOSE_BLOOD() == null ? (double)allFm.getTH_LOSE_BLOOD() : null);
294   -
295   - deliverAddRequest.setProdprocess(map);
296   - deliverAddRequest.setTotalprocess(totalMap);
  263 + deliverAddRequest.setoHloseBloodL(StringUtils.isNotEmpty(allFm.getOH_LOSE_BLOOD()) ? Double.parseDouble(allFm.getOH_LOSE_BLOOD()) : null);
  264 + deliverAddRequest.settHloseBloodL(StringUtils.isNotEmpty(allFm.getTH_LOSE_BLOOD()) ? Double.parseDouble(allFm.getTH_LOSE_BLOOD()) : null);
297 265 deliverAddRequest.setDeliverDoctor(allFm.getDELIVER_DOCTOR());
298 266 deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate));
299 267 deliverAddRequest.setParentId(patient.getId());
300 268  
301 269  
302 270  
303 271  
304 272  
305 273  
306 274  
307 275  
... ... @@ -311,31 +279,89 @@
311 279 deliverAddRequest.setDueWeek(week);
312 280 }
313 281  
314   - deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1)
315   - if(allFm.getFETUS_NUM() != null){
316   - deliverAddRequest.setPlacenta(allFm.getFETUS_NUM()+"");// 胎盘(之前赋值为死值1)
  282 + if (StringUtils.isNotEmpty(allFm.getFETUS_NUM()))
  283 + {
  284 + deliverAddRequest.setTireNumber(Integer.parseInt(allFm.getFETUS_NUM().toString()));// 胎数
317 285 }
  286 + else
  287 + {
  288 + deliverAddRequest.setTireNumber(1);// 胎数
  289 + }
  290 +
  291 + if(StringUtils.isNotEmpty(allFm.getFETUS_NUM())){
  292 + deliverAddRequest.setPlacenta(allFm.getFETUS_NUM()+"");// 胎盘
  293 + }
318 294 if ("完整".equals(allFm.getPERINEAL_CONDITION()) || "".equals(allFm.getPERINEAL_CONDITION())) {
319 295 deliverAddRequest.setPerinealCondition("full");
320 296 } else if ("切开".equals(allFm.getPERINEAL_CONDITION()) || "侧切".equals(allFm.getPERINEAL_CONDITION())) {
321 297 deliverAddRequest.setPerinealCondition("split");
322 298 }
323 299  
324   - if ("1度".equals(allFm.getPERINEAL_CONDITION())) {
  300 + if ("1度".equals(allFm.getSILIE_LEVEL())) {
325 301 deliverAddRequest.setSiLielevel(1);
326   - } else if ("2度".equals(allFm.getPERINEAL_CONDITION())) {
  302 + } else if ("2度".equals(allFm.getSILIE_LEVEL())) {
327 303 deliverAddRequest.setSiLielevel(2);
328   - } else if ("3度".equals(allFm.getPERINEAL_CONDITION())) {
  304 + } else if ("3度".equals(allFm.getSILIE_LEVEL())) {
329 305 deliverAddRequest.setSiLielevel(3);
330 306 }
  307 + deliverAddRequest.setNeedleNum(allFm.getNEEDLE_NUM());
  308 + deliverAddRequest.setPulse(allFm.getPULSE());
  309 + deliverAddRequest.setBreath(allFm.getBREATH());
  310 + Map chbp = new HashMap<>();
  311 + Map ch2bp = new HashMap<>();
  312 + if (StringUtils.isNotEmpty(allFm.getCHBP()) && allFm.getCHBP().contains("/"))
  313 + {
  314 + String[] arrs = allFm.getCHBP().split("/");
  315 + chbp.put("ssy",arrs[0]);
  316 + chbp.put("szy",arrs[1]);
  317 + }
  318 + if (StringUtils.isNotEmpty(allFm.getCH2BP()) && allFm.getCH2BP().contains("/"))
  319 + {
  320 + String[] arrs = allFm.getCH2BP().split("/");
  321 + ch2bp.put("ssy",arrs[0]);
  322 + ch2bp.put("szy",arrs[1]);
  323 + }
  324 + deliverAddRequest.setChBp(chbp);
  325 + deliverAddRequest.setCh2Bp(ch2bp);
331 326  
332   - Integer th_Lose = allFm.getTH_LOSE_BLOOD();
333   - if(th_Lose!=null){
334   - if (StringUtils.isNotEmpty(allFm.getTH_LOSE_BLOOD().toString())) {
335   - deliverAddRequest.settHloseBloodL(Double.parseDouble(allFm.getTH_LOSE_BLOOD().toString()));
336   - }
  327 +
  328 + Map<String, Map<String,String>> map = new HashMap<>();
  329 + Map<String, String> map1 = new HashMap<>();
  330 + Map<String, String> map2 = new HashMap<>();
  331 + Map<String, String> map3 = new HashMap<>();
  332 + Map<String, String> totalMap = new HashMap<>();
  333 +
  334 + String prod_Process_One = allFm.getPROD_PROCESS_ONE();
  335 + String prod_Process_Two = allFm.getPROD_PROCESS_TWO();
  336 + String prod_Process_Three = allFm.getPROD_PROCESS_THREE();
  337 + if(StringUtils.isNotEmpty(prod_Process_One)){
  338 + map1.put("h",String.valueOf(Integer.parseInt(prod_Process_One)/60));
  339 + map1.put("m",String.valueOf(Integer.parseInt(prod_Process_One)%60));
  340 + map.put("one", map1);
337 341 }
  342 + if(StringUtils.isNotEmpty(prod_Process_Two)){
  343 + map2.put("h",String.valueOf(Integer.parseInt(prod_Process_Two)/60));
  344 + map2.put("m",String.valueOf(Integer.parseInt(prod_Process_Two)%60));
  345 + map.put("two",map2);
  346 + }
  347 + if(StringUtils.isNotEmpty(prod_Process_Three)){
  348 + map3.put("h",String.valueOf(Integer.parseInt(prod_Process_Three)/60));
  349 + map3.put("m",String.valueOf(Integer.parseInt(prod_Process_Three)%60));
  350 + map.put("three",map3);
  351 + }
  352 + if(StringUtils.isNotEmpty(allFm.getTOTAL_PROCESS())){
  353 + int hProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())/60;//总产程小时数
  354 + totalMap.put("h",String.valueOf(hProcess));
  355 + }
  356 + if(StringUtils.isNotEmpty(allFm.getTOTAL_PROCESS())){
  357 + int mProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())%60;//总产程分钟数
  358 + totalMap.put("m",String.valueOf(mProcess));
  359 + }
338 360  
  361 + deliverAddRequest.setProdprocess(map);
  362 + deliverAddRequest.setTotalprocess(totalMap);
  363 +
  364 +
339 365 Map deliveryMode = new HashMap(); //分娩方式
340 366  
341 367 String fmfs = "";
342 368  
... ... @@ -347,7 +373,19 @@
347 373 {
348 374 fmfs = FmTypeEnums.O.getId();
349 375 }
  376 + String fmsc = "";
  377 + if (allFm.getDELIVERY_TYPE() != null && "自然娩出".equals(allFm.getDELIVERY_TYPE()))
  378 + {
  379 + fmsc = FmTypeEnums.FmScEnums.O.getId();
  380 + }
  381 + Map loseBloodCause = new HashMap();
  382 + loseBloodCause.put("select","1");
  383 + loseBloodCause.put("other","");
  384 +
  385 + deliverAddRequest.setLoseBloodCause(loseBloodCause);
  386 +
350 387 deliveryMode.put("fmfs",fmfs);
  388 + deliveryMode.put("scfs",fmsc);
351 389 deliverAddRequest.setDeliveryMode(deliveryMode);
352 390 //胎盘信息
353 391 List<MaternalDeliverModel.ExtPlacenta> extPlacentas = new ArrayList<>();
... ... @@ -359,6 +397,32 @@
359 397 tpmcType = TpmcTypeEnums.O.getId();
360 398 }
361 399 extPlacenta.setTpmcType(tpmcType);
  400 + if (StringUtils.isNotEmpty(allFm.getTMCSIDE()))
  401 + {
  402 + extPlacenta.setMcType("子面".equals(allFm.getTMCSIDE()) ? "ziMian": "muMian");
  403 + }
  404 + if (StringUtils.isNotEmpty(allFm.getTLONG()) && StringUtils.isNotEmpty(allFm.getTWIDTH()) && StringUtils.isNotEmpty(allFm.getTHEIGHT()))
  405 + {
  406 + Map tpSize = new HashMap();
  407 + tpSize.put("c",allFm.getTLONG());
  408 + tpSize.put("k",allFm.getTWIDTH());
  409 + tpSize.put("g",allFm.getTHEIGHT());
  410 + extPlacenta.setTpSize(tpSize);
  411 + }
  412 + extPlacenta.setTpWeight(allFm.getTWEIGHT());
  413 + extPlacenta.setUmbilicalCordLength(allFm.getUM_LENGTH());
  414 + if (StringUtils.isNotEmpty(allFm.getUM_EXTYPE()))
  415 + {
  416 + extPlacenta.setUmbilicalCordEx("yes");
  417 + for (QiDaiEnums qiDaiEnums : QiDaiEnums.values()) {
  418 + if (qiDaiEnums.getName().equals(allFm.getUM_EXTYPE())) {
  419 + extPlacenta.setUmbilicalCordExType(qiDaiEnums.getId());
  420 + break;
  421 + }
  422 + }
  423 + }
  424 + extPlacenta.setUmbilicalCordLength(allFm.getUM_LENGTH());
  425 +
362 426 extPlacentas.add(extPlacenta);
363 427 deliverAddRequest.setExtPlacentas(extPlacentas);
364 428  
... ... @@ -366,9 +430,9 @@
366 430 //儿童
367 431 MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby();
368 432 Map<String, String> as = new HashMap<>();
369   - Integer pf1 = allFm.getBABY_APGAR_SCORE_ONE();
370   - Integer pf5 = allFm.getBABY_APGAR_SCORE_FIVE();
371   - Integer pf10 = allFm.getBABY_APGAR_SCORE_TEN();
  433 + String pf1 = allFm.getBABY_APGAR_SCORE_ONE();
  434 + String pf5 = allFm.getBABY_APGAR_SCORE_FIVE();
  435 + String pf10 = allFm.getBABY_APGAR_SCORE_TEN();
372 436 if(pf1!=null){
373 437 as.put("pf1", allFm.getBABY_APGAR_SCORE_ONE().toString());
374 438 }
375 439  
376 440  
377 441  
378 442  
... ... @@ -378,24 +442,25 @@
378 442 if(pf10!=null){
379 443 as.put("pf10", allFm.getBABY_APGAR_SCORE_TEN().toString());
380 444 }
381   -
382   -
383 445 baby.setApgarScore(as);
  446 + baby.setEarlySuck("yes");
  447 + baby.setAsphyxiaM("0");
  448 +
  449 + baby.setContactStartM(allFm.getBABY_TOUCH_STARTM());
  450 + baby.setContactM(allFm.getBABY_TOUCH_LASTM());
384 451 baby.setBabyGender("男".equals(allFm.getBABY_SEX()) ? "1" : "0");
385   - Integer babyHeight = allFm.getBABY_HEIGHT();
386   - Integer babyWeight = allFm.getBABY_WEIGHT();
387   - Integer baby_Asphyxiam = allFm.getBABY_ASPHYXIAM();
  452 + String babyHeight = allFm.getBABY_HEIGHT();
  453 + String babyWeight = allFm.getBABY_WEIGHT();
  454 +
388 455 if(babyHeight!=null){
389 456 baby.setBabyHeight(allFm.getBABY_HEIGHT().toString());//新生儿生长
390 457 }
391 458 if(babyWeight!=null){
392 459 baby.setBabyWeight(allFm.getBABY_WEIGHT().toString());//新生儿重量
393 460 }
394   - if(baby_Asphyxiam!=null){
395   - baby.setAsphyxiaM(allFm.getBABY_ASPHYXIAM().toString()); //窒息分钟
396   - }
397 461  
398   - baby.setDeformity((allFm.getBABY_DEFORMITY()==null?0:1)); //畸形 0非畸形 1畸形
  462 +
  463 + baby.setDeformity(((allFm.getBABY_DEFORMITY()==null || "非畸形".equals(allFm.getBABY_DEFORMITY())) ? 0 : 1)); //畸形 0非畸形 1畸形
399 464 baby.setBabyHealthy("良好");
400 465  
401 466 //String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT();
402 467  
403 468  
404 469  
... ... @@ -428,33 +493,22 @@
428 493 fmitem.setYexb(allFm.getBABY_SEX());
429 494 fmitem.setRc(allFm.getDUE_WEEK());
430 495 fmitem.setFmfs(allFm.getDELIVERY_MODE());
431   - Integer fetus_Num = allFm.getFETUS_NUM();
  496 + String fetus_Num = allFm.getFETUS_NUM();
432 497 if(fetus_Num!=null){
433 498 fmitem.setDjt(allFm.getFETUS_NUM().toString());
434 499 }
435 500 fmitem.setCjc("");
436   - Integer babyHeight = allFm.getBABY_HEIGHT();
437   - Integer babyWeight = allFm.getBABY_WEIGHT();
  501 + String babyHeight = allFm.getBABY_HEIGHT();
  502 + String babyWeight = allFm.getBABY_WEIGHT();
438 503 if(babyHeight!=null){
439 504 fmitem.setSc(allFm.getBABY_HEIGHT().toString());
440 505 }
441 506 if(babyWeight!=null){
442 507 fmitem.setTz(allFm.getBABY_WEIGHT().toString());
443 508 }
444   - Integer pf1 = allFm.getBABY_APGAR_SCORE_ONE();
445   - Integer pf5 = allFm.getBABY_APGAR_SCORE_FIVE();
446   - Integer pf10 = allFm.getBABY_APGAR_SCORE_TEN();
447   - if(pf1!=null){
448   - fmitem.setYfz(allFm.getBABY_APGAR_SCORE_ONE().toString());
449   - }
450   - if(pf5!=null){
451   - fmitem.setWfz(allFm.getBABY_APGAR_SCORE_FIVE().toString());
452   - }
453   - if(pf10!=null){
454   - fmitem.setSfz(allFm.getBABY_APGAR_SCORE_TEN().toString());
455   - }
  509 +
456 510 fmitem.setSfgw("");
457   - Integer baby_Deformity = allFm.getBABY_DEFORMITY();
  511 + String baby_Deformity = allFm.getBABY_DEFORMITY();
458 512 if(baby_Deformity!=null){
459 513 fmitem.setJx(allFm.getBABY_DEFORMITY().toString());
460 514 }
461 515  
... ... @@ -484,14 +538,14 @@
484 538 }
485 539  
486 540  
487   - private List buildBabyName(List<Fm> items) {
  541 + private List buildBabyName(List<HsFm> items) {
488 542 String id = "";
489 543 if (items.size() > 2) {
490 544 int boyCount = 0;
491 545 int girlCount = 0;
492 546 List<String> l = new ArrayList<>();
493 547 for (int i = 0; i < items.size(); i++) {
494   - Fm item = items.get(i);
  548 + HsFm item = items.get(i);
495 549 if (org.apache.commons.lang.StringUtils.isNotEmpty(item.getBABY_SEX())) {
496 550 if ("男".equals(item.getBABY_SEX())) {
497 551 l.add(ONE_ENUMS.get(boyCount) + "子");
... ... @@ -505,7 +559,7 @@
505 559 return l;
506 560 } else {
507 561 for (int i = 0; i < items.size(); i++) {
508   - Fm item = items.get(i);
  562 + HsFm item = items.get(i);
509 563 if (org.apache.commons.lang.StringUtils.isNotEmpty(item.getBABY_SEX())) {
510 564 if ("男".equals(item.getBABY_SEX()))
511 565 {
... ... @@ -522,7 +576,7 @@
522 576 }
523 577 }
524 578  
525   - public void buildBaby(FmItem item,Patients patInfo,Fm fm, Date dueDate, String babyName)
  579 + public void buildBaby(FmItem item,Patients patInfo,HsFm fm, Date dueDate, String babyName)
526 580 {
527 581 try{
528 582  
529 583  
530 584  
... ... @@ -598,30 +652,19 @@
598 652 request.setDueType(fmfs);//分娩方式
599 653 //request.setFetusCount(item.getDjt()); //第几胎
600 654 //request.setDueCount(item.getCjc());//第几产
601   - Integer weight = fm.getBABY_WEIGHT();
602   - Integer height = fm.getBABY_HEIGHT();
  655 + String weight = fm.getBABY_WEIGHT();
  656 + String height = fm.getBABY_HEIGHT();
603 657 if(weight!=null){
604 658 DecimalFormat df = new DecimalFormat("#.00");
605 659 double w = Double.parseDouble(weight.toString());
606   - request.setBabyWeight(df.format(w/1000)); //体重
  660 + request.setBabyWeight(df.format(w / 1000)); //体重
607 661 }
608 662 if(height!=null){
609 663 request.setBabyHeight(height.toString()); //身长
610 664 }
611 665  
612 666 Map<String,String> map = new HashMap<>();
613   - Integer pf1 = fm.getBABY_APGAR_SCORE_ONE();
614   - Integer pf5 = fm.getBABY_APGAR_SCORE_FIVE();
615   - Integer pf10 = fm.getBABY_APGAR_SCORE_TEN();
616   - if(pf1!=null){
617   - map.put("pf1", pf1.toString());
618   - }
619   - if(pf5!=null){
620   - map.put("pf5", pf5.toString());
621   - }
622   - if(pf10!=null){
623   - map.put("pf10", pf10.toString());
624   - }
  667 +
625 668  
626 669 request.setApgarScore(map);
627 670 request.setDeliverOrg(HOSPITALID);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ fff1785
... ... @@ -431,7 +431,7 @@
431 431 if (CollectionUtils.isEmpty(babyModels)) {
432 432 handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1, hospitalId);
433 433 } else {
434   - maternalDeliverModel.setBaby(updateBaby(deliverAddRequest, list, patients1.getLastMenses()));
  434 + maternalDeliverModel.setBaby(updateBaby(babyModels, deliverAddRequest, list, patients1.getLastMenses()));
435 435 }
436 436 }
437 437 if (deliverAddRequest.getPatient() == null) {
... ... @@ -528,7 +528,7 @@
528 528 List <MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies();
529 529 //修改小孩信息
530 530 if (CollectionUtils.isNotEmpty(list)) {
531   - maternalDeliverModel.setBaby(updateBaby(deliverAddRequest, list, patients2.getLastMenses()));
  531 + maternalDeliverModel.setBaby(updateBaby(null,deliverAddRequest, list, patients2.getLastMenses()));
532 532 }
533 533  
534 534 MatDeliverQuery query = new MatDeliverQuery();
... ... @@ -899,7 +899,7 @@
899 899 * @param list
900 900 * @return
901 901 */
902   - private List updateBaby(MatDeliverAddRequest deliverAddRequest, List <MatDeliverAddRequest.Baby> list, Date
  902 + private List updateBaby(List <BabyModel> babyModels,MatDeliverAddRequest deliverAddRequest, List <MatDeliverAddRequest.Baby> list, Date
903 903 lastMenses) {
904 904 List <MaternalDeliverModel.Baby> babyList = new ArrayList <>();
905 905 for (MatDeliverAddRequest.Baby baby : list) {
... ... @@ -1084,6 +1084,23 @@
1084 1084 babyModel.setZl(baby.getZl());
1085 1085  
1086 1086 babyService.findAndModify(query.convertToQuery(), babyModel1);
  1087 + }
  1088 + else {
  1089 + if (CollectionUtils.isNotEmpty(babyModels))
  1090 + {
  1091 + for(BabyModel b : babyModels)
  1092 + {
  1093 + if (baby.getDueTime().contains(DateUtil.getyyyy_MM_dd(b.getBirth())))
  1094 + {
  1095 + babyModel.setId(b.getId());
  1096 + b.setBuildType(2);
  1097 + b.setPregnancyOut("0");
  1098 + b.setDataStatus(0);
  1099 + babyService.updateOneBaby(b,b.getId());
  1100 + break;
  1101 + }
  1102 + }
  1103 + }
1087 1104 }
1088 1105 babyList.add(babyModel);
1089 1106 }