fangcheng / regional-platform

Download as
Browse Code »

Commit 378b5d64bf07f46f0564dfdc0e9a104d99d3bd93

Authored by jiangjiazhi
2 parents c3570f3c25 4581f377f2
Exists in master

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 378b5d6
... ... @@ -139,7 +139,7 @@
139 139 query = childbirthManagerRequest.getNormalQueryMap();
140 140 } else {
141 141 // 区域
142   - query = childbirthManagerRequest.getAraeQueryMap();
  142 + query = childbirthManagerRequest.getAreaQueryMap();
143 143 }
144 144 String queryStr = "";
145 145 for (String key : query.keySet()) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 378b5d6
... ... @@ -510,6 +510,60 @@
510 510 return "syncPatientsLastCheckEmployeeId start......";
511 511 }
512 512  
  513 + /**
  514 + * @auther HuJiaqi
  515 + * @createTime 2016年12月21日 15时56分
  516 + * @discription 冗余分娩分娩医院，分娩年龄，分娩孕周，分娩方式
  517 + */
  518 + @ResponseBody
  519 + @RequestMapping(value = "/syncPatientsFmInfo1", method = RequestMethod.GET)
  520 + public String syncPatientsFmInfo1(@RequestParam(required = false) String size) {
  521 + PatientsQuery patientsQuery = new PatientsQuery();
  522 + patientsQuery.setYn(YnEnums.YES.getId());
  523 + patientsQuery.setType(3);
  524 + // 查询
  525 + List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
  526 + System.out.println("本次读取了【" + patientsList.size() + "】条数据");
  527 + int batchSize = StringUtils.isEmpty(size) ? 1000 : Integer.valueOf(size);
  528 + int end = 0;
  529 + for (int i = 0; i < patientsList.size(); i += batchSize) {
  530 + end = (end + batchSize);
  531 + if (end > patientsList.size()) {
  532 + end = patientsList.size();
  533 + }
  534 + final List<Patients> tempList = patientsList.subList(i, end);
  535 + new Thread(new Runnable() {
  536 + @Override
  537 + public void run() {
  538 + if (CollectionUtils.isNotEmpty(tempList)) {
  539 + for (Patients patients : tempList) {
  540 +
  541 + try {
  542 + patients.setFmAge(DateUtil.getAge(patients.getBirth(), patients.getFmDate()));
  543 + } catch (Exception e) {
  544 + System.out.println(patients.getId() + "：这条数据的生日和分娩时间异常");
  545 + // 跳过
  546 + }
  547 + try {
  548 + patients.setFmWeek(DateUtil.getDays(patients.getLastMenses(), patients.getFmDate()));
  549 + } catch (Exception e) {
  550 + System.out.println(patients.getId() + "：这条数据的末日月经和分娩时间异常");
  551 + // 跳过
  552 + }
  553 +
  554 +
  555 + System.out.println(patients.getFmAge());
  556 + System.out.println(patients.getFmWeek());
  557 +
  558 + patientsService.updatePatient(patients);
  559 + }
  560 + }
  561 + }
  562 + }).start();
  563 + }
  564 + return "syncPatientsLastCheckEmployeeId start......";
  565 + }
  566 +
513 567 @RequestMapping(value = "/initCardNo", method = RequestMethod.GET)
514 568 @ResponseBody
515 569 public String initCardNo() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 378b5d6
... ... @@ -1041,267 +1041,375 @@
1041 1041 matDeliverQuery.setParentIdList(parentIdList);
1042 1042 matDeliverQuery.setYn(YnEnums.YES.getId());
1043 1043 List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1044   - if (CollectionUtils.isEmpty(maternalDeliverModelList)) {
1045   - // 没有查到，直接抛出
1046   - childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
1047   - childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
1048   - return childbirthManagerResult;
1049   - }
1050 1044  
1051 1045 List<ChildbirthManagerQueryModel> childbirthManagerQueryModelList = new ArrayList<>();
1052   - for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) {
1053   - for (Patients patients : patientsList) {
1054   - if (maternalDeliverModel.getParentId().equals(patients.getId())) {
1055   - // 这里分好了组，开始往结果集里面加数据
1056   - ChildbirthManagerQueryModel childbirthManagerQueryModel = new ChildbirthManagerQueryModel();
1057   - BeanUtils.copy(patients, childbirthManagerQueryModel);
1058   - BeanUtils.copy(maternalDeliverModel, childbirthManagerQueryModel);
1059   - // name
1060   - childbirthManagerQueryModel.setName(patients.getUsername());
1061   - // 各种id
1062   - childbirthManagerQueryModel.setpId(maternalDeliverModel.getPid());
1063   - childbirthManagerQueryModel.setPatientId(patients.getId());
1064   - childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
1065   - // 居住地
1066   - if (childbirthManagerRequest.getInitQuery().contains("address")) {
1067   - childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
  1046 + for (Patients patients : patientsList) {
  1047 + MaternalDeliverModel maternalDeliverModel = null;
  1048 + for (MaternalDeliverModel each : maternalDeliverModelList) {
  1049 + if (each.getParentId().equals(patients.getId())) {
  1050 + maternalDeliverModel = each;
  1051 + }
  1052 + if (maternalDeliverModel == null) {
  1053 + maternalDeliverModel = new MaternalDeliverModel();
  1054 + }
  1055 + }
  1056 +
  1057 + // 开始封装数据
  1058 + ChildbirthManagerQueryModel childbirthManagerQueryModel = new ChildbirthManagerQueryModel();
  1059 + if (maternalDeliverModel != null) {
  1060 + BeanUtils.copy(maternalDeliverModel, childbirthManagerQueryModel);
  1061 + }
  1062 + BeanUtils.copy(patients, childbirthManagerQueryModel);
  1063 + // 分娩孕周
  1064 + String week = (patients.getFmWeek() / 7) + "";
  1065 + int day = (patients.getFmWeek() % 7);
  1066 + childbirthManagerQueryModel.setDueWeek("孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""));
  1067 + // 分娩日期
  1068 + childbirthManagerQueryModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getFmDate()));
  1069 + // name
  1070 + childbirthManagerQueryModel.setName(patients.getUsername());
  1071 + // 各种id
  1072 + childbirthManagerQueryModel.setPid(patients.getPid());
  1073 + childbirthManagerQueryModel.setPatientId(patients.getId());
  1074 + // 居住地
  1075 + if (childbirthManagerRequest.getInitQuery().contains("address")) {
  1076 + childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
  1077 + }
  1078 + // 电话转换
  1079 + childbirthManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
  1080 + childbirthManagerQueryModel.setHusbandPhone(DefenceUtils.getPhone(patients.getHusbandPhone()));
  1081 + // 加密身份证号
  1082 + childbirthManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
  1083 + // 年龄
  1084 + childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth()));
  1085 +
  1086 + // 居住类型
  1087 + if (childbirthManagerRequest.getInitQuery().contains("pliveTypeId")) {
  1088 + try {
  1089 + if(StringUtils.isNotEmpty(patients.getPliveTypeId())) {
  1090 + childbirthManagerQueryModel.setPliveTypeId(basicConfigService.getOneBasicConfigById(patients.getPliveTypeId()).getName());
1068 1091 }
1069   - // 电话转换
1070   - childbirthManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
1071   - childbirthManagerQueryModel.setHusbandPhone(DefenceUtils.getPhone(patients.getHusbandPhone()));
1072   - // 加密身份证号
1073   - childbirthManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
1074   - // 查询分娩方式
1075   - if (childbirthManagerRequest.getInitQuery().contains("deliveryMode")) {
1076   - String deliveryModeJson = maternalDeliverModel.getDeliveryMode();
1077   - Map<String, String> deliveryModeMap = JsonUtil.getMap(deliveryModeJson);
1078   - if (MapUtils.isNotEmpty(deliveryModeMap) && StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) {
1079   - for (FmTypeEnums fmTypeEnums : FmTypeEnums.values()) {
1080   - if (fmTypeEnums.getId().equals(deliveryModeMap.get("fmfs"))) {
1081   - childbirthManagerQueryModel.setDeliveryMode(fmTypeEnums.getName());
1082   - break;
  1092 + } catch (Exception e) {
  1093 + // 什么都不干
  1094 + }
  1095 + }
  1096 +
  1097 + // 户口类型
  1098 + if (childbirthManagerRequest.getInitQuery().contains("pcensusTypeId")) {
  1099 + try {
  1100 + if(StringUtils.isNotEmpty(patients.getPcensusTypeId())) {
  1101 + childbirthManagerQueryModel.setPcensusTypeId(basicConfigService.getOneBasicConfigById(patients.getPcensusTypeId()).getName());
  1102 + }
  1103 + } catch (Exception e) {
  1104 + // 什么都不干
  1105 + }
  1106 + }
  1107 +
  1108 + // 查询活产数
  1109 + // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形
  1110 + if (childbirthManagerRequest.getInitQuery().contains("livingNumber") || childbirthManagerRequest.getInitQuery().contains("pregnancyOut") || childbirthManagerRequest.getInitQuery().contains("sex") || childbirthManagerRequest.getInitQuery().contains("babyWeight") || childbirthManagerRequest.getInitQuery().contains("babyHeight") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf1") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf5") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf10") || childbirthManagerRequest.getInitQuery().contains("asphyxiaM") || childbirthManagerRequest.getInitQuery().contains("babyHealthy") || childbirthManagerRequest.getInitQuery().contains("malformation")) {
  1111 + BabyModelQuery babyModelQuery = new BabyModelQuery();
  1112 + babyModelQuery.setYn(YnEnums.YES.getId());
  1113 + babyModelQuery.setParentId(patients.getId());
  1114 + babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId());
  1115 + List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
  1116 + if (CollectionUtils.isNotEmpty(babyModelList)) {
  1117 + childbirthManagerQueryModel.setLivingNumber(babyModelList.size());
  1118 + } else {
  1119 + if (childbirthManagerQueryModel.getTireNumber() == null) {
  1120 + childbirthManagerQueryModel.setLivingNumber(null);
  1121 + } else {
  1122 + childbirthManagerQueryModel.setLivingNumber(0);
  1123 + }
  1124 + }
  1125 +
  1126 + if (CollectionUtils.isNotEmpty(babyModelList)) {
  1127 + String pregnancyOut = "";
  1128 + String sex = "";
  1129 + String babyWeight = "";
  1130 + String babyHeight = "";
  1131 + String apgarScorePf1 = "";
  1132 + String apgarScorePf5 = "";
  1133 + String apgarScorePf10 = "";
  1134 + String asphyxiaM = "";
  1135 + String babyHealthy = "";
  1136 + String malformation = "";
  1137 + try {
  1138 + for (BabyModel babyModel : babyModelList) {
  1139 + if (childbirthManagerRequest.getInitQuery().contains("pregnancyOut")) {
  1140 + for (RenShenJieJuEnums renShenJieJuEnums : RenShenJieJuEnums.values()) {
  1141 + if (renShenJieJuEnums.getId().equals(babyModel.getPregnancyOut())) {
  1142 + pregnancyOut += renShenJieJuEnums.getName() + ",";
  1143 + break;
  1144 + }
1083 1145 }
1084 1146 }
1085   - } else {
1086   - childbirthManagerQueryModel.setDeliveryMode("");
1087   - }
1088   - }
1089   - // 产妇情况
1090   - if (childbirthManagerRequest.getInitQuery().contains("maternalInfo")) {
1091   - if (StringUtils.isNotBlank(maternalDeliverModel.getMaternalInfo())) {
1092   - for (CfEnums cfEnums : CfEnums.values()) {
1093   - if (cfEnums.getId().equals(maternalDeliverModel.getMaternalInfo())) {
1094   - childbirthManagerQueryModel.setMaternalInfo(cfEnums.getName());
1095   - break;
  1147 + if (childbirthManagerRequest.getInitQuery().contains("sex")) {
  1148 + for (SexEnum sexEnum : SexEnum.values()) {
  1149 + if (sexEnum.getId().equals(babyModel.getSex())) {
  1150 + sex += sexEnum.getText() + ",";
  1151 + break;
  1152 + }
1096 1153 }
1097 1154 }
  1155 + babyWeight += babyModel.getBabyWeight() == null ? "" : babyModel.getBabyWeight() + ",";
  1156 + babyHeight += babyModel.getBabyHeight() == null ? "" : babyModel.getBabyHeight() + ",";
  1157 + asphyxiaM += babyModel.getAsphyxiaM() == null ? "" : babyModel.getAsphyxiaM() + ",";
  1158 + babyHealthy += babyModel.getBabyHealthy() == null ? "" : babyModel.getBabyHealthy() + ",";
  1159 + malformation += babyModel.getMalformation() == null ? "" : babyModel.getMalformation() + ",";
  1160 + Map<String, String> map = JsonUtil.getMap(babyModel.getApgarScore());
  1161 + if (MapUtils.isNotEmpty(map)) {
  1162 + apgarScorePf1 += map.get("pf1") == null ? "" : map.get("pf1") + ",";
  1163 + apgarScorePf5 += map.get("pf5") == null ? "" : map.get("pf5") + ",";
  1164 + apgarScorePf10 += map.get("pf10") == null ? "" : map.get("pf10") + ",";
  1165 + }
1098 1166 }
1099   - }
1100   - // 查询接生医生
1101   - try {
1102   - if (childbirthManagerRequest.getInitQuery().contains("deliverDoctor")) {
1103   - childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
1104   - }
1105 1167 } catch (Exception e) {
1106 1168 // 什么都不干，这么干是为了避开原始数据的问题
1107 1169 }
1108   - childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth()));
1109   - // 查询活产数
1110   - if (childbirthManagerRequest.getInitQuery().contains("livingNumber")) {
1111   - BabyModelQuery babyModelQuery = new BabyModelQuery();
1112   - babyModelQuery.setYn(YnEnums.YES.getId());
1113   - babyModelQuery.setParentId(patients.getId());
1114   - babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId());
1115   - List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
1116   - if (CollectionUtils.isNotEmpty(babyModelList)) {
1117   - childbirthManagerQueryModel.setLivingNumber(babyModelList.size());
  1170 + childbirthManagerQueryModel.setPregnancyOut(pregnancyOut.length() == 0 ? "" : pregnancyOut.substring(0, pregnancyOut.length() - 1));
  1171 + childbirthManagerQueryModel.setSex(sex.length() == 0 ? "" : sex.substring(0, sex.length() - 1));
  1172 + childbirthManagerQueryModel.setBabyWeight(babyWeight.length() == 0 ? "" : babyWeight.substring(0, babyWeight.length() - 1));
  1173 + childbirthManagerQueryModel.setBabyHeight(babyHeight.length() == 0 ? "" : babyHeight.substring(0, babyHeight.length() - 1));
  1174 + childbirthManagerQueryModel.setApgarScorePf1(apgarScorePf1.length() == 0 ? "" : apgarScorePf1.substring(0, apgarScorePf1.length() - 1));
  1175 + childbirthManagerQueryModel.setApgarScorePf5(apgarScorePf5.length() == 0 ? "" : apgarScorePf5.substring(0, apgarScorePf5.length() - 1));
  1176 + childbirthManagerQueryModel.setApgarScorePf10(apgarScorePf10.length() == 0 ? "" : apgarScorePf10.substring(0, apgarScorePf10.length() - 1));
  1177 + childbirthManagerQueryModel.setAsphyxiaM(asphyxiaM.length() == 0 ? "" : asphyxiaM.substring(0, asphyxiaM.length() - 1));
  1178 + childbirthManagerQueryModel.setBabyHealthy(babyHealthy.length() == 0 ? "" : babyHealthy.substring(0, babyHealthy.length() - 1));
  1179 + childbirthManagerQueryModel.setMalformation(malformation.length() == 0 ? "" : malformation.substring(0, malformation.length() - 1));
  1180 + }
  1181 + }
  1182 +
  1183 + if (maternalDeliverModel != null) {
  1184 + // 会阴情况
  1185 + if (childbirthManagerRequest.getInitQuery().contains("perinealCondition")) {
  1186 + if (StringUtils.isNotEmpty(maternalDeliverModel.getPerinealCondition())) {
  1187 + if ("split".equals(maternalDeliverModel.getPerinealCondition())) {
  1188 + childbirthManagerQueryModel.setPerinealCondition("切开");
  1189 + } else if ("full".equals(maternalDeliverModel.getPerinealCondition())) {
  1190 + childbirthManagerQueryModel.setPerinealCondition("完整");
1118 1191 } else {
1119   - childbirthManagerQueryModel.setLivingNumber(0);
  1192 + childbirthManagerQueryModel.setPerinealCondition("-");
1120 1193 }
  1194 + }
  1195 + }
1121 1196  
1122   - // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形
1123   - if (childbirthManagerRequest.getInitQuery().contains("pregnancyOut") || childbirthManagerRequest.getInitQuery().contains("sex") || childbirthManagerRequest.getInitQuery().contains("babyWeight") || childbirthManagerRequest.getInitQuery().contains("babyHeight") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf1") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf5") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf10") || childbirthManagerRequest.getInitQuery().contains("asphyxiaM") || childbirthManagerRequest.getInitQuery().contains("babyHealthy") || childbirthManagerRequest.getInitQuery().contains("malformation")) {
1124   - if (CollectionUtils.isNotEmpty(babyModelList)) {
1125   - String pregnancyOut = "";
1126   - String sex = "";
1127   - String babyWeight = "";
1128   - String babyHeight = "";
1129   - String apgarScorePf1 = "";
1130   - String apgarScorePf5 = "";
1131   - String apgarScorePf10 = "";
1132   - String asphyxiaM = "";
1133   - String babyHealthy = "";
1134   - String malformation = "";
1135   - try {
1136   - for (BabyModel babyModel : babyModelList) {
1137   - if (childbirthManagerRequest.getInitQuery().contains("pregnancyOut")) {
1138   - for (RenShenJieJuEnums renShenJieJuEnums : RenShenJieJuEnums.values()) {
1139   - if (renShenJieJuEnums.getId().equals(babyModel.getPregnancyOut())) {
1140   - pregnancyOut += renShenJieJuEnums.getName() + ",";
1141   - break;
1142   - }
1143   - }
1144   - }
1145   - if (childbirthManagerRequest.getInitQuery().contains("sex")) {
1146   - for (SexEnum sexEnum : SexEnum.values()) {
1147   - if (sexEnum.getId().equals(babyModel.getSex())) {
1148   - sex += sexEnum.getText() + ",";
1149   - break;
1150   - }
1151   - }
1152   - }
1153   - babyWeight += babyModel.getBabyWeight() == null ? "" : babyModel.getBabyWeight() + ",";
1154   - babyHeight += babyModel.getBabyHeight() == null ? "" : babyModel.getBabyHeight() + ",";
1155   - asphyxiaM += babyModel.getAsphyxiaM() == null ? "" : babyModel.getAsphyxiaM() + ",";
1156   - babyHealthy += babyModel.getBabyHealthy() == null ? "" : babyModel.getBabyHealthy() + ",";
1157   - malformation += babyModel.getMalformation() == null ? "" : babyModel.getMalformation() + ",";
1158   - Map<String, String> map = JsonUtil.getMap(babyModel.getApgarScore());
1159   - if (MapUtils.isNotEmpty(map)) {
1160   - apgarScorePf1 += map.get("pf1") == null ? "" : map.get("pf1") + ",";
1161   - apgarScorePf5 += map.get("pf5") == null ? "" : map.get("pf5") + ",";
1162   - apgarScorePf10 += map.get("pf10") == null ? "" : map.get("pf10") + ",";
1163   - }
1164   - }
1165   - } catch (Exception e) {
1166   - // 什么都不干，这么干是为了避开原始数据的问题
1167   - }
1168   - childbirthManagerQueryModel.setPregnancyOut(pregnancyOut.length() == 0 ? "" : pregnancyOut.substring(0, pregnancyOut.length() - 1));
1169   - childbirthManagerQueryModel.setSex(sex.length() == 0 ? "" : sex.substring(0, sex.length() - 1));
1170   - childbirthManagerQueryModel.setBabyWeight(babyWeight.length() == 0 ? "" : babyWeight.substring(0, babyWeight.length() - 1));
1171   - childbirthManagerQueryModel.setBabyHeight(babyHeight.length() == 0 ? "" : babyHeight.substring(0, babyHeight.length() - 1));
1172   - childbirthManagerQueryModel.setApgarScorePf1(apgarScorePf1.length() == 0 ? "" : apgarScorePf1.substring(0, apgarScorePf1.length() - 1));
1173   - childbirthManagerQueryModel.setApgarScorePf5(apgarScorePf5.length() == 0 ? "" : apgarScorePf5.substring(0, apgarScorePf5.length() - 1));
1174   - childbirthManagerQueryModel.setApgarScorePf10(apgarScorePf10.length() == 0 ? "" : apgarScorePf10.substring(0, apgarScorePf10.length() - 1));
1175   - childbirthManagerQueryModel.setAsphyxiaM(asphyxiaM.length() == 0 ? "" : asphyxiaM.substring(0, asphyxiaM.length() - 1));
1176   - childbirthManagerQueryModel.setBabyHealthy(babyHealthy.length() == 0 ? "" : babyHealthy.substring(0, babyHealthy.length() - 1));
1177   - childbirthManagerQueryModel.setMalformation(malformation.length() == 0 ? "" : malformation.substring(0, malformation.length() - 1));
  1197 + // 失血原因
  1198 + if (childbirthManagerRequest.getInitQuery().contains("loseBloodCause")) {
  1199 + String loseBloodCauseJson = maternalDeliverModel.getLoseBloodCause();
  1200 + Map<String, String> loseBloodCauseMap = JsonUtil.getMap(loseBloodCauseJson);
  1201 + if (MapUtils.isNotEmpty(loseBloodCauseMap) && StringUtils.isNotEmpty(loseBloodCauseMap.get("select"))) {
  1202 + for (SXCauseEnums sxCauseEnums : SXCauseEnums.values()) {
  1203 + if (sxCauseEnums.getId().equals(loseBloodCauseMap.get("select"))) {
  1204 + childbirthManagerQueryModel.setLoseBloodCause(sxCauseEnums.getName());
  1205 + break;
1178 1206 }
1179 1207 }
1180   - try {
1181   - if (childbirthManagerRequest.getInitQuery().contains("fmHospital")) {
1182   - childbirthManagerQueryModel.setFmHospital(organizationService.getOrganization(Integer.valueOf(maternalDeliverModel.getFmHospital())).getName());
  1208 + if (SXCauseEnums.O5.getName().equals(childbirthManagerQueryModel.getLoseBloodCause()) && StringUtils.isNotEmpty(loseBloodCauseMap.get("other"))) {
  1209 + childbirthManagerQueryModel.setLoseBloodCause(loseBloodCauseMap.get("other"));
  1210 + }
  1211 + } else {
  1212 + childbirthManagerQueryModel.setLoseBloodCause("");
  1213 + }
  1214 + }
  1215 +
  1216 + // 查询分娩方式
  1217 + childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
  1218 + if (childbirthManagerRequest.getInitQuery().contains("deliveryMode")) {
  1219 + String deliveryModeJson = maternalDeliverModel.getDeliveryMode();
  1220 + Map<String, String> deliveryModeMap = JsonUtil.getMap(deliveryModeJson);
  1221 + if (MapUtils.isNotEmpty(deliveryModeMap) && StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) {
  1222 + for (FmTypeEnums fmTypeEnums : FmTypeEnums.values()) {
  1223 + if (fmTypeEnums.getId().equals(deliveryModeMap.get("fmfs"))) {
  1224 + childbirthManagerQueryModel.setDeliveryMode(fmTypeEnums.getName());
  1225 + break;
1183 1226 }
1184   - } catch (Exception e) {
1185   - // 什么都不干，这么干是为了避开原始数据的问题
1186 1227 }
  1228 + } else {
  1229 + childbirthManagerQueryModel.setDeliveryMode("");
  1230 + }
  1231 + }
1187 1232  
  1233 + // 产妇情况
  1234 + if (childbirthManagerRequest.getInitQuery().contains("maternalInfo")) {
  1235 + if (StringUtils.isNotBlank(maternalDeliverModel.getMaternalInfo())) {
  1236 + for (CfEnums cfEnums : CfEnums.values()) {
  1237 + if (cfEnums.getId().equals(maternalDeliverModel.getMaternalInfo())) {
  1238 + childbirthManagerQueryModel.setMaternalInfo(cfEnums.getName());
  1239 + break;
  1240 + }
  1241 + }
1188 1242 }
  1243 + }
1189 1244  
1190   - // 开始拼装自定义查询结果
1191   - // 胎方位，胎心率，胎先露
1192   - if (childbirthManagerRequest.getInitQuery().contains("fetalPosition") || childbirthManagerRequest.getInitQuery().contains("heartRate") || childbirthManagerRequest.getInitQuery().contains("fetalPresentation")) {
1193   - // 这个泛型不会出错，传入的就是这个
1194   - @SuppressWarnings("unchecked")
1195   - List<MatDeliverAddRequest.Placenta> placentaList = maternalDeliverModel.getPlacentas();
1196   - if (CollectionUtils.isNotEmpty(placentaList)) {
1197   - String fetalPosition = "";
1198   - String heartRate = "";
1199   - String fetalPresentation = "";
1200   - for (Object obj : placentaList) {
1201   - if ("com.lyms.platform.operate.web.request.MatDeliverAddRequest$Placenta".equals(obj.getClass().getName())) {
1202   - MatDeliverAddRequest.Placenta placenta = (MatDeliverAddRequest.Placenta) obj;
1203   - if (childbirthManagerRequest.getInitQuery().contains("fetalPosition")) {
  1245 + // 查询接生医生
  1246 + try {
  1247 + if (childbirthManagerRequest.getInitQuery().contains("deliverDoctor")) {
  1248 + childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
  1249 + }
  1250 + } catch (Exception e) {
  1251 + // 什么都不干，这么干是为了避开原始数据的问题
  1252 + }
  1253 +
  1254 + // 查分娩医院
  1255 + try {
  1256 + if (childbirthManagerRequest.getInitQuery().contains("fmHospital")) {
  1257 + childbirthManagerQueryModel.setFmHospital(organizationService.getOrganization(Integer.valueOf(maternalDeliverModel.getFmHospital())).getName());
  1258 + }
  1259 + } catch (Exception e) {
  1260 + // 什么都不干，这么干是为了避开原始数据的问题
  1261 + }
  1262 +
  1263 + // 胎方位，胎心率，胎先露
  1264 + if (childbirthManagerRequest.getInitQuery().contains("fetalPosition") || childbirthManagerRequest.getInitQuery().contains("heartRate") || childbirthManagerRequest.getInitQuery().contains("fetalPresentation")) {
  1265 + // 这个泛型不会出错，传入的就是这个
  1266 + @SuppressWarnings("unchecked")
  1267 + List<MatDeliverAddRequest.Placenta> placentaList = maternalDeliverModel.getPlacentas();
  1268 + if (CollectionUtils.isNotEmpty(placentaList)) {
  1269 + String fetalPosition = "";
  1270 + String heartRate = "";
  1271 + String fetalPresentation = "";
  1272 + for (Object obj : placentaList) {
  1273 + if ("com.lyms.platform.operate.web.request.MatDeliverAddRequest$Placenta".equals(obj.getClass().getName())) {
  1274 + MatDeliverAddRequest.Placenta placenta = (MatDeliverAddRequest.Placenta) obj;
  1275 + if (childbirthManagerRequest.getInitQuery().contains("fetalPosition")) {
  1276 + for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) {
  1277 + if (fetalPositionEnums.getId().equals(placenta.getFetalPosition())) {
  1278 + fetalPosition += fetalPositionEnums.getName() + ",";
  1279 + break;
  1280 + }
  1281 + }
  1282 + }
  1283 + heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString() + ",";
  1284 + fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation() + ",";
  1285 + }
  1286 + if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) {
  1287 + Map<String, String> placenta = JsonUtil.getMap(obj.toString());
  1288 + if (childbirthManagerRequest.getInitQuery().contains("fetalPosition")) {
  1289 + if (MapUtils.isNotEmpty(placenta)) {
1204 1290 for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) {
1205   - if (fetalPositionEnums.getId().equals(placenta.getFetalPosition())) {
  1291 + if (fetalPositionEnums.getId().equals(placenta.get("fetalPosition"))) {
1206 1292 fetalPosition += fetalPositionEnums.getName() + ",";
1207 1293 break;
1208 1294 }
1209 1295 }
  1296 + heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate") + ",";
  1297 + fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation") + ",";
1210 1298 }
1211   - heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString() + ",";
1212   - fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation() + ",";
1213 1299 }
1214   - if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) {
1215   - Map<String, String> placenta = JsonUtil.getMap(obj.toString());
1216   - if (childbirthManagerRequest.getInitQuery().contains("fetalPosition")) {
1217   - if (MapUtils.isNotEmpty(placenta)) {
1218   - for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) {
1219   - if (fetalPositionEnums.getId().equals(placenta.get("fetalPosition"))) {
1220   - fetalPosition += fetalPositionEnums.getName() + ",";
1221   - break;
1222   - }
1223   - }
1224   - heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate") + ",";
1225   - fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation") + ",";
1226   - }
1227   - }
1228   - }
1229 1300 }
1230   - childbirthManagerQueryModel.setFetalPosition(fetalPosition.length() == 0 ? "" : fetalPosition.substring(0, fetalPosition.length() - 1));
1231   - childbirthManagerQueryModel.setHeartRate(heartRate.length() == 0 ? "" : heartRate.substring(0, heartRate.length() - 1));
1232   - childbirthManagerQueryModel.setFetalPresentation(fetalPresentation.length() == 0 ? "" : fetalPresentation.substring(0, fetalPresentation.length() - 1));
1233 1301 }
  1302 + childbirthManagerQueryModel.setFetalPosition(fetalPosition.length() == 0 ? "" : fetalPosition.substring(0, fetalPosition.length() - 1));
  1303 + childbirthManagerQueryModel.setHeartRate(heartRate.length() == 0 ? "" : heartRate.substring(0, heartRate.length() - 1));
  1304 + childbirthManagerQueryModel.setFetalPresentation(fetalPresentation.length() == 0 ? "" : fetalPresentation.substring(0, fetalPresentation.length() - 1));
1234 1305 }
1235   - // 第一产程，第二产程，第三产程
1236   - Map<String, Map<String, String>> prodprocessMap = JsonUtil.getDoubleMap(maternalDeliverModel.getProdprocess());
1237   - if (MapUtils.isNotEmpty(prodprocessMap)) {
1238   - Map<String, String> prodprocessOne = prodprocessMap.get("one");
1239   - if (MapUtils.isNotEmpty(prodprocessOne)) {
1240   - childbirthManagerQueryModel.setProdprocessOne("h:" + prodprocessOne.get("h") + "," + "m:" + prodprocessOne.get("m"));
1241   - }
1242   - Map<String, String> prodprocessTwo = prodprocessMap.get("two");
1243   - if (MapUtils.isNotEmpty(prodprocessTwo)) {
1244   - childbirthManagerQueryModel.setProdprocessTwo("h:" + prodprocessTwo.get("h") + "," + "m:" + prodprocessTwo.get("m"));
1245   - }
1246   - Map<String, String> prodprocessThree = prodprocessMap.get("three");
1247   - if (MapUtils.isNotEmpty(prodprocessThree)) {
1248   - childbirthManagerQueryModel.setProdprocessThree("h:" + prodprocessThree.get("h") + "," + "m:" + prodprocessThree.get("m"));
1249   - }
  1306 + }
  1307 +
  1308 + // 第一产程，第二产程，第三产程
  1309 + Map<String, Map<String, String>> prodprocessMap = JsonUtil.getDoubleMap(maternalDeliverModel.getProdprocess());
  1310 + if (MapUtils.isNotEmpty(prodprocessMap)) {
  1311 + Map<String, String> prodprocessOne = prodprocessMap.get("one");
  1312 + if (MapUtils.isNotEmpty(prodprocessOne)) {
  1313 + childbirthManagerQueryModel.setProdprocessOne(prodprocessOne.get("h") + "时," + prodprocessOne.get("m") + "分");
  1314 + }else{
  1315 + childbirthManagerQueryModel.setProdprocessOne("");
1250 1316 }
1251   - // 总产程
1252   - Map<String, String> totalprocessMap = JsonUtil.getMap(maternalDeliverModel.getTotalprocess());
1253   - if (MapUtils.isNotEmpty(totalprocessMap)) {
1254   - childbirthManagerQueryModel.setTotalprocess("h:" + totalprocessMap.get("h") + "," + "m:" + totalprocessMap.get("m"));
  1317 + Map<String, String> prodprocessTwo = prodprocessMap.get("two");
  1318 + if (MapUtils.isNotEmpty(prodprocessTwo)) {
  1319 + childbirthManagerQueryModel.setProdprocessTwo(prodprocessTwo.get("h") + "时," + prodprocessTwo.get("m") + "分");
  1320 + }else{
  1321 + childbirthManagerQueryModel.setProdprocessTwo("");
1255 1322 }
1256   - // 收缩压，舒张压
1257   - Map<String, String> chBpMap = JsonUtil.getMap(maternalDeliverModel.getChBp());
1258   - if (MapUtils.isNotEmpty(chBpMap)) {
1259   - childbirthManagerQueryModel.setChBpSsy1(chBpMap.get("ssy"));
1260   - childbirthManagerQueryModel.setChBpSzy1(chBpMap.get("szy"));
  1323 + Map<String, String> prodprocessThree = prodprocessMap.get("three");
  1324 + if (MapUtils.isNotEmpty(prodprocessThree)) {
  1325 + childbirthManagerQueryModel.setProdprocessThree(prodprocessThree.get("h") + "时," + prodprocessThree.get("m") + "分");
  1326 + }else{
  1327 + childbirthManagerQueryModel.setProdprocessThree("");
1261 1328 }
1262   - // 胎盘娩出方式，胎盘大小，胎盘重量，脐带长度，脐带是否异常，脐带异常类型
1263   - if (childbirthManagerRequest.getInitQuery().contains("tpmcType") || childbirthManagerRequest.getInitQuery().contains("tpSize") || childbirthManagerRequest.getInitQuery().contains("tpWeight") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordLength") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordEx") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordExType")) {
1264   - List<MaternalDeliverModel.ExtPlacenta> extPlacentaList = maternalDeliverModel.getExtPlacentas();
1265   - if (CollectionUtils.isNotEmpty(extPlacentaList)) {
1266   - String tpmcType = "";
1267   - String tpSize = "";
1268   - String tpWeight = "";
1269   - String umbilicalCordLength = "";
1270   - String umbilicalCordEx = "";
1271   - String umbilicalCordExType = "";
1272   - try {
1273   - for (MaternalDeliverModel.ExtPlacenta extPlacenta : extPlacentaList) {
1274   - if (childbirthManagerRequest.getInitQuery().contains("tpmcType")) {
1275   - for (TpmcTypeEnums tpmcTypeEnums : TpmcTypeEnums.values()) {
1276   - if (tpmcTypeEnums.getId().equals(extPlacenta.getTpmcType())) {
1277   - tpmcType += tpmcTypeEnums.getName() + ",";
1278   - break;
1279   - }
  1329 + }
  1330 +
  1331 + // 总产程
  1332 + Map<String, String> totalprocessMap = JsonUtil.getMap(maternalDeliverModel.getTotalprocess());
  1333 + if (MapUtils.isNotEmpty(totalprocessMap)) {
  1334 + childbirthManagerQueryModel.setTotalprocess(totalprocessMap.get("h") + "时," + totalprocessMap.get("m") + "分");
  1335 + }else{
  1336 + childbirthManagerQueryModel.setTotalprocess("");
  1337 + }
  1338 +
  1339 + // 收缩压，舒张压
  1340 + Map<String, String> chBpMap = JsonUtil.getMap(maternalDeliverModel.getChBp());
  1341 + if (MapUtils.isNotEmpty(chBpMap)) {
  1342 + childbirthManagerQueryModel.setChBpSsy1(chBpMap.get("ssy"));
  1343 + childbirthManagerQueryModel.setChBpSzy1(chBpMap.get("szy"));
  1344 +
  1345 + }
  1346 + // 胎盘娩出方式，胎盘大小，胎盘重量，脐带长度，脐带是否异常，脐带异常类型
  1347 + if (childbirthManagerRequest.getInitQuery().contains("tpmcType") || childbirthManagerRequest.getInitQuery().contains("tpSize") || childbirthManagerRequest.getInitQuery().contains("tpWeight") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordLength") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordEx") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordExType")) {
  1348 + List<MaternalDeliverModel.ExtPlacenta> extPlacentaList = maternalDeliverModel.getExtPlacentas();
  1349 + if (CollectionUtils.isNotEmpty(extPlacentaList)) {
  1350 + String tpmcType = "";
  1351 + String tpSize = "";
  1352 + String tpWeight = "";
  1353 + String umbilicalCordLength = "";
  1354 + String umbilicalCordEx = "";
  1355 + String umbilicalCordExType = "";
  1356 + try {
  1357 + for (MaternalDeliverModel.ExtPlacenta extPlacenta : extPlacentaList) {
  1358 + if (childbirthManagerRequest.getInitQuery().contains("tpmcType")) {
  1359 + for (TpmcTypeEnums tpmcTypeEnums : TpmcTypeEnums.values()) {
  1360 + if (tpmcTypeEnums.getId().equals(extPlacenta.getTpmcType())) {
  1361 + tpmcType += tpmcTypeEnums.getName() + ",";
  1362 + break;
1280 1363 }
1281 1364 }
1282   - tpSize += extPlacenta.getTpSize() == null ? "" : extPlacenta.getTpSize() + ",";
1283   - tpWeight += extPlacenta.getTpWeight() == null ? "" : extPlacenta.getTpWeight() + ",";
1284   - umbilicalCordLength += extPlacenta.getUmbilicalCordLength() == null ? "" : extPlacenta.getUmbilicalCordLength() + ",";
1285   - umbilicalCordEx += extPlacenta.getUmbilicalCordEx() == null ? "" : extPlacenta.getUmbilicalCordEx() + ",";
1286   - umbilicalCordExType += extPlacenta.getUmbilicalCordExType() == null ? "" : extPlacenta.getUmbilicalCordExType() + ",";
1287 1365 }
1288   - } catch (Exception e) {
1289   - // 什么都不干，这么干是为了避开原始数据的问题
  1366 + if (childbirthManagerRequest.getInitQuery().contains("umbilicalCordExType")) {
  1367 + String umbilicalCordExTypeTemp = "";
  1368 + for (QiDaiEnums qiDaiEnums : QiDaiEnums.values()) {
  1369 + if (qiDaiEnums.getId().equals(extPlacenta.getUmbilicalCordExType())) {
  1370 + umbilicalCordExTypeTemp = qiDaiEnums.getName() + ",";
  1371 + break;
  1372 + }
  1373 + }
  1374 + if (StringUtils.isEmpty(umbilicalCordExTypeTemp)) {
  1375 + umbilicalCordExTypeTemp = "-,";
  1376 + }
  1377 + umbilicalCordExType += umbilicalCordExTypeTemp;
  1378 + }
  1379 + if (childbirthManagerRequest.getInitQuery().contains("umbilicalCordEx")) {
  1380 + if ("yes".equals(extPlacenta.getUmbilicalCordEx())) {
  1381 + umbilicalCordEx += "是" + ",";
  1382 + } else if ("no".equals(extPlacenta.getUmbilicalCordEx())) {
  1383 + umbilicalCordEx += "否" + ",";
  1384 + } else {
  1385 + umbilicalCordEx += "-" + ",";
  1386 + }
  1387 + }
  1388 + if (childbirthManagerRequest.getInitQuery().contains("tpSize")) {
  1389 + if (MapUtils.isNotEmpty(extPlacenta.getTpSize())) {
  1390 + tpSize += "长:" + extPlacenta.getTpSize().get("c") + "宽:" + extPlacenta.getTpSize().get("k") + "高:" + extPlacenta.getTpSize().get("g") + ",";
  1391 + }
  1392 + }
  1393 + tpWeight += extPlacenta.getTpWeight() == null ? "" : extPlacenta.getTpWeight() + ",";
  1394 + umbilicalCordLength += extPlacenta.getUmbilicalCordLength() == null ? "" : extPlacenta.getUmbilicalCordLength() + ",";
1290 1395 }
1291   - childbirthManagerQueryModel.setTpmcType(tpmcType.length() == 0 ? "" : tpmcType.substring(0, tpmcType.length() - 1));
1292   - childbirthManagerQueryModel.setTpSize(tpSize.length() == 0 ? "" : tpSize.substring(0, tpSize.length() - 1));
1293   - childbirthManagerQueryModel.setTpWeight(tpWeight.length() == 0 ? "" : tpWeight.substring(0, tpWeight.length() - 1));
1294   - childbirthManagerQueryModel.setUmbilicalCordLength(umbilicalCordLength.length() == 0 ? "" : umbilicalCordLength.substring(0, umbilicalCordLength.length() - 1));
1295   - childbirthManagerQueryModel.setUmbilicalCordEx(umbilicalCordEx.length() == 0 ? "" : umbilicalCordEx.substring(0, umbilicalCordEx.length() - 1));
1296   - childbirthManagerQueryModel.setUmbilicalCordExType(umbilicalCordExType.length() == 0 ? "" : umbilicalCordExType.substring(0, umbilicalCordExType.length() - 1));
  1396 + } catch (Exception e) {
  1397 + // 什么都不干，这么干是为了避开原始数据的问题
1297 1398 }
  1399 + childbirthManagerQueryModel.setTpmcType(tpmcType.length() == 0 ? "" : tpmcType.substring(0, tpmcType.length() - 1));
  1400 + childbirthManagerQueryModel.setTpSize(tpSize.length() == 0 ? "" : tpSize.substring(0, tpSize.length() - 1));
  1401 + childbirthManagerQueryModel.setTpWeight(tpWeight.length() == 0 ? "" : tpWeight.substring(0, tpWeight.length() - 1));
  1402 + childbirthManagerQueryModel.setUmbilicalCordLength(umbilicalCordLength.length() == 0 ? "" : umbilicalCordLength.substring(0, umbilicalCordLength.length() - 1));
  1403 + childbirthManagerQueryModel.setUmbilicalCordEx(umbilicalCordEx.length() == 0 ? "" : umbilicalCordEx.substring(0, umbilicalCordEx.length() - 1));
  1404 + childbirthManagerQueryModel.setUmbilicalCordExType(umbilicalCordExType.length() == 0 ? "" : umbilicalCordExType.substring(0, umbilicalCordExType.length() - 1));
1298 1405 }
1299   - // 拼装自定义查询结果结束
1300   -
1301   - childbirthManagerQueryModelList.add(childbirthManagerQueryModel);
1302 1406 }
1303 1407 }
  1408 +
  1409 + childbirthManagerQueryModelList.add(childbirthManagerQueryModel);
1304 1410 }
  1411 + // 拼装自定义查询结果结束
  1412 +
1305 1413  
1306 1414 childbirthManagerResult.setData(childbirthManagerQueryModelList);
1307 1415 childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 378b5d6
... ... @@ -11,6 +11,7 @@
11 11 import com.lyms.platform.common.result.BaseObjectResponse;
12 12 import com.lyms.platform.common.result.BaseResponse;
13 13 import com.lyms.platform.common.utils.DateUtil;
  14 +import com.lyms.platform.common.utils.DefenceUtils;
14 15 import com.lyms.platform.common.utils.ExcelUtil;
15 16 import com.lyms.platform.common.utils.SystemConfig;
16 17 import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest;
... ... @@ -151,7 +152,7 @@
151 152 archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(),
152 153 archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), archiveModel.getAddressRegister(), basicConfigService));
153 154 archiveMap.put("workUnit", archiveModel.getWorkUnit());
154   - archiveMap.put("buildDay", archiveModel.getBuildDay());
  155 + archiveMap.put("buildDay", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay()));
155 156 }
156 157  
157 158 resultMap.put("archiveResult", archiveMap);
... ... @@ -416,7 +417,7 @@
416 417 ResidentsArchiveModel model = residentsArchiveService.getResident(checkup.getParentId());
417 418 map.put("premaritalUpTime", DateUtil.getyyyy_MM_dd(checkup.getPremaritalUpTime()));
418 419 map.put("username", model.getUsername());
419   - map.put("certificateNum", model.getCertificateNum());
  420 + map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum()));
420 421 map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
421 422 if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo() == PhysiologyStatusEnum.NORMAL.getId()) {
422 423 map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle());
423 424  
... ... @@ -821,12 +822,18 @@
821 822 String username = "";
822 823 String phone = "";
823 824 Integer age = null;
  825 + String certificateTypeId = "";
  826 + String certificateNum = "";
  827 + String vcCardNo = "";
824 828  
825 829 if (StringUtils.isNotEmpty(checkup.getParentId())){
826 830 ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(checkup.getParentId());
827 831 if (archiveModel!=null && archiveModel.getYn()==YnEnums.YES.getId()){
828 832 username = archiveModel.getUsername();
829 833 phone = archiveModel.getPhone();
  834 + certificateTypeId = archiveModel.getCertificateTypeId();
  835 + certificateNum = archiveModel.getCertificateNum();
  836 + vcCardNo = archiveModel.getVcCardNo();
830 837 if (archiveModel.getBirthday()!=null){
831 838 age = DateUtil.getAge(archiveModel.getBirthday());
832 839 }
... ... @@ -844,9 +851,9 @@
844 851 }
845 852 }
846 853 map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime()));
847   - map.put("certificateTypeId", getBaseicConfigByid(checkup.getCertificateTypeId()));
848   - map.put("certificateNum", checkup.getCertificateTypeId());
849   - map.put("vcCardNo", checkup.getVcCardNo());
  854 + map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId));
  855 + map.put("certificateNum", DefenceUtils.getId(certificateNum));
  856 + map.put("vcCardNo", vcCardNo);
850 857 map.put("sexType", "女");
851 858 if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) {
852 859 map.put("deliverStatus", "提供");
853 860  
... ... @@ -1184,12 +1191,18 @@
1184 1191 String username = "";
1185 1192 String phone = "";
1186 1193 Integer age = null;
  1194 + String certificateTypeId = "";
  1195 + String certificateNum = "";
  1196 + String vcCardNo = "";
1187 1197  
1188 1198 if (StringUtils.isNotEmpty(checkup.getParentId())){
1189 1199 ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(checkup.getParentId());
1190 1200 if (archiveModel!=null && archiveModel.getYn()==YnEnums.YES.getId()){
1191 1201 username = archiveModel.getUsername();
1192 1202 phone = archiveModel.getPhone();
  1203 + certificateTypeId = archiveModel.getCertificateTypeId();
  1204 + certificateNum = archiveModel.getCertificateNum();
  1205 + vcCardNo = archiveModel.getVcCardNo();
1193 1206 if (archiveModel.getBirthday()!=null){
1194 1207 age = DateUtil.getAge(archiveModel.getBirthday());
1195 1208 }
... ... @@ -1207,9 +1220,9 @@
1207 1220 }
1208 1221 }
1209 1222 map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime()));
1210   - map.put("certificateTypeId", getBaseicConfigByid(checkup.getCertificateTypeId()));
1211   - map.put("certificateNum", checkup.getCertificateTypeId());
1212   - map.put("vcCardNo", checkup.getVcCardNo());
  1223 + map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId));
  1224 + map.put("certificateNum", DefenceUtils.getId(certificateNum));
  1225 + map.put("vcCardNo", vcCardNo);
1213 1226 map.put("sexType", "男");
1214 1227 if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) {
1215 1228 map.put("deliverStatus", "提供");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 378b5d6
... ... @@ -632,7 +632,7 @@
632 632 }
633 633 }
634 634 map.put("age",data.getAge());
635   - map.put("phone",data.getPhone());
  635 + map.put("phone",DefenceUtils.getPhone(data.getPhone()));
636 636 map.put("workUnit",data.getWorkUnit());
637 637 map.put("residence",CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(),
638 638 data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java View file @ 378b5d6
... ... @@ -372,7 +372,7 @@
372 372 }
373 373 }
374 374 map.put("age",data.getAge());
375   - map.put("phone",data.getPhone());
  375 + map.put("phone",DefenceUtils.getPhone(data.getPhone()));
376 376 map.put("workUnit",data.getWorkUnit());
377 377 map.put("residence",CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(),
378 378 data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ 378b5d6
... ... @@ -154,7 +154,7 @@
154 154  
155 155 private Map<String, String> normalQueryMap;
156 156  
157   - private Map<String, String> araeQueryMap;
  157 + private Map<String, String> areaQueryMap;
158 158  
159 159 private boolean isExcel;
160 160  
161 161  
... ... @@ -352,12 +352,12 @@
352 352 this.normalQueryMap = normalQueryMap;
353 353 }
354 354  
355   - public Map<String, String> getAraeQueryMap() {
356   - return araeQueryMap;
  355 + public Map<String, String> getAreaQueryMap() {
  356 + return areaQueryMap;
357 357 }
358 358  
359   - public void setAraeQueryMap(Map<String, String> araeQueryMap) {
360   - this.araeQueryMap = araeQueryMap;
  359 + public void setAreaQueryMap(Map<String, String> areaQueryMap) {
  360 + this.areaQueryMap = areaQueryMap;
361 361 }
362 362  
363 363 public ChildbirthManagerRequest() {
... ... @@ -417,7 +417,7 @@
417 417 initQueryMap.put("fmHospital", "分娩机构");
418 418 initQueryMap.put("maternalDeliverId", "");
419 419 initQueryMap.put("patientId", "");
420   - initQueryMap.put("pId", "");
  420 + initQueryMap.put("pid", "");
421 421 Map<String, String> normalQueryMap = new LinkedHashMap<>();
422 422 normalQueryMap.put("dueDate", "分娩日期");
423 423 normalQueryMap.put("name", "姓名");
... ... @@ -432,7 +432,7 @@
432 432 normalQueryMap.put("phone", "联系方式");
433 433 normalQueryMap.put("maternalDeliverId", "");
434 434 normalQueryMap.put("patientId", "");
435   - normalQueryMap.put("pId", "");
  435 + normalQueryMap.put("pid", "");
436 436 Map<String, String> areaQueryMap = new LinkedHashMap<>();
437 437 areaQueryMap.put("dueDate", "分娩日期");
438 438 areaQueryMap.put("name", "姓名");
439 439  
... ... @@ -447,10 +447,10 @@
447 447 areaQueryMap.put("fmHospital", "分娩机构");
448 448 areaQueryMap.put("maternalDeliverId", "");
449 449 areaQueryMap.put("patientId", "");
450   - areaQueryMap.put("pId", "");
  450 + areaQueryMap.put("pid", "");
451 451 this.initQueryMap = initQueryMap;
452 452 this.normalQueryMap = normalQueryMap;
453   - this.araeQueryMap = areaQueryMap;
  453 + this.areaQueryMap = areaQueryMap;
454 454 }
455 455 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java View file @ 378b5d6
... ... @@ -12,7 +12,7 @@
12 12  
13 13 private String patientId;
14 14  
15   - private String pId;
  15 + private String pid;
16 16  
17 17 /**
18 18 * @auther HuJiaqi
19 19  
... ... @@ -416,12 +416,12 @@
416 416 this.patientId = patientId;
417 417 }
418 418  
419   - public String getpId() {
420   - return pId;
  419 + public String getPid() {
  420 + return pid;
421 421 }
422 422  
423   - public void setpId(String pId) {
424   - this.pId = pId;
  423 + public void setPid(String pid) {
  424 + this.pid = pid;
425 425 }
426 426  
427 427 public String getDueDate() {