jiangjiazhi / regional-platform

Download as
Browse Code »

Commit cbd4ee42cafbfd06c971325d24787a1592cfb74b

Authored by yangfei
1 parent 05728718f3
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

同步数据到小程序

Showing 2 changed files with 125 additions and 54 deletions

platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java View file @ cbd4ee4
... ... @@ -651,10 +651,19 @@
651 651 */
652 652 private static String convertNewAntExChuResult(AntExChuModel antExChuModel, BasicConfigService basicConfigService, Map<String, String> bgMap, String doctorUserName) {
653 653  
  654 + // String antChuStr = JsonUtil.obj2JsonString(antExChuModel);
  655 + // JSONObject antChuJson = JsonUtil.getObj(antChuStr);
  656 + JSONObject antChuJson = new JSONObject();
  657 + //诊断时间
  658 + antChuJson.put("checkTime", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
  659 + //末次月经
  660 + antChuJson.put("lastMenses", DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses()));
654 661  
655   - String antChuStr = JsonUtil.obj2JsonString(antExChuModel);
656   - JSONObject antChuJson = JsonUtil.getObj(antChuStr);
  662 + Date dueDate = DateUtil.addDay(antExChuModel.getLastMenses(), 280);
657 663  
  664 + //预产期
  665 + antChuJson.put("dueDate", DateUtil.getyyyy_MM_dd(dueDate));
  666 +
658 667 //孕期当前体重
659 668 antChuJson.put("weight", StringUtils.unitHandle(antExChuModel.getWeight(), UnitConstants.KG));
660 669 //孕前体重
661 670  
662 671  
663 672  
664 673  
665 674  
666 675  
667 676  
668 677  
669 678  
670 679  
671 680  
672 681  
673 682  
674 683  
675 684  
676 685  
677 686  
... ... @@ -665,65 +674,125 @@
665 674 antChuJson.put("fuwei", StringUtils.unitHandle(antExChuModel.getFuwei(), UnitConstants.CM));
666 675 //身高
667 676 antChuJson.put("height", StringUtils.unitHandle(antExChuModel.getHeight(), UnitConstants.CM));
668   - //既往史
  677 + /**妇科检查**/
  678 +
  679 + //外阴
  680 + if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getVulvaSele())) {
  681 + if ("2".equals(antExChuModel.getVulvaSele())) {
  682 + antChuJson.put("vulva", "未见异常");
  683 + } else if ("1".equals(antExChuModel.getVulvaSele())) {
  684 + antChuJson.put("vulva", antExChuModel.getVulva());
  685 + }
  686 + } else {//空
  687 + antChuJson.put("vulva", antExChuModel.getVulva());
  688 + }
  689 + //阴道
  690 + if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getVaginaSele())) {
  691 + if ("2".equals(antExChuModel.getVaginaSele())) {
  692 + antChuJson.put("vagina", "未见异常");
  693 + } else if ("1".equals(antExChuModel.getVaginaSele())) {
  694 + antChuJson.put("vagina", antExChuModel.getVagina());
  695 + }
  696 + } else {//空
  697 + antChuJson.put("vagina", antExChuModel.getVagina());
  698 + }
  699 + //宫颈
  700 + if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getCervicalSele())) {
  701 + if ("2".equals(antExChuModel.getCervicalSele())) {
  702 + antChuJson.put("cervical", "未见异常");
  703 + } else if ("1".equals(antExChuModel.getCervicalSele())) {
  704 + antChuJson.put("cervical", antExChuModel.getCervical());
  705 + }
  706 + } else {//空
  707 + antChuJson.put("cervical", antExChuModel.getCervical());
  708 + }
  709 + //子宫
  710 + if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getUterusSele())) {
  711 + if ("2".equals(antExChuModel.getUterusSele())) {
  712 + antChuJson.put("uterus", "未见异常");
  713 + } else if ("1".equals(antExChuModel.getUterusSele())) {
  714 + antChuJson.put("uterus", antExChuModel.getUterus());
  715 + }
  716 + } else {//空
  717 + antChuJson.put("uterus", antExChuModel.getUterus());
  718 + }
  719 + //附件
  720 + if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getFujianSele())) {
  721 + if ("1".equals(antExChuModel.getFujianSele())) {
  722 + antChuJson.put("fujian", antExChuModel.getFujian());
  723 + } else if ("2".equals(antExChuModel.getFujianSele())) {
  724 + antChuJson.put("fujian", "未见异常");
  725 + }
  726 + } else {//空
  727 + antChuJson.put("fujian", antExChuModel.getFujian());
  728 + }
  729 +
669 730 String pastHistory = "";
670 731 if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getPastHistory())) {
671 732 Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getPastHistory(), Map.class);
672 733 pastHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
673 734 }
  735 + //既往史
674 736 antChuJson.put("pastHistory", pastHistory);
675   - //家族史
676 737 String familyHistory = "";
677 738 if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getFamilyHistory())) {
678 739 Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getFamilyHistory(), Map.class);
679 740 familyHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
680 741 }
  742 + //家族史
681 743 antChuJson.put("familyHistory", familyHistory);
682   - //个人史
683 744 String personalHistory = "";
684 745 if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getPersonalHistory())) {
685 746 Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getPersonalHistory(), Map.class);
686 747 personalHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
687 748 }
  749 + //个人史
688 750 antChuJson.put("personalHistory", personalHistory);
689   - //疫苗接种史
690 751 String ymjzHistory = "";
691 752 if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getYmjzHistory())) {
692 753 Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getYmjzHistory(), Map.class);
693 754 ymjzHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
694 755 }
  756 + //疫苗接种史
695 757 antChuJson.put("ymjzHistory", ymjzHistory);
696   - //药物过敏史
  758 +
697 759 String ywgmHistory = "";
698 760 if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getYwgmHistory())) {
699 761 Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getYwgmHistory(), Map.class);
700 762 ywgmHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
701 763 }
  764 + //药物过敏史
702 765 antChuJson.put("ywgmHistory", ywgmHistory);
703   - //妇科手术史
704 766 String fksxHistory = "";
705 767 if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getFksxHistory())) {
706 768 Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getFksxHistory(), Map.class);
707 769 fksxHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
708 770 }
  771 + //妇科手术史
709 772 antChuJson.put("fksxHistory", fksxHistory);
710   - //叶酸服用
711 773 String ysfyHistory = "";
712 774 if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getYsfyHistory())) {
713 775 Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getYsfyHistory(), Map.class);
714 776 ysfyHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
715 777 }
  778 + //叶酸服用
716 779 antChuJson.put("ysfyHistory", ysfyHistory);
717   - //本次妊娠情况
  780 +
718 781 String cestationInfo = "";
719 782 if (org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getCestationInfo())) {
720 783 Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getCestationInfo(), Map.class);
721 784 cestationInfo = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
722 785 }
  786 + //本次妊娠情况
723 787 antChuJson.put("cestationInfo", cestationInfo);
  788 +
724 789 //孕产史
725 790 //孕次
726 791 antChuJson.put("pregnancyTimes", StringUtils.unitHandle(antExChuModel.getPregnancyTimes(), UnitConstants.CI));
  792 + //心脏
  793 + antChuJson.put("heart", antExChuModel.getHeart());
  794 + //肺部
  795 + antChuJson.put("lungs", antExChuModel.getLungs());
727 796 //产次
728 797 antChuJson.put("prodTime", StringUtils.unitHandle(antExChuModel.getProdTime(), UnitConstants.CI));
729 798 //顺产
730 799  
... ... @@ -743,11 +812,11 @@
743 812 //身高
744 813 antChuJson.put("height", StringUtils.unitHandle(antExChuModel.getHeight(), UnitConstants.CM));
745 814 //体重
746   - antChuJson.put("weight", StringUtils.unitHandle(antExChuModel.getWeight(), UnitConstants.KG));
  815 + antChuJson.put("weight", antExChuModel.getWeight());
747 816 //体重指数
748 817 antChuJson.put("baricIndex", antExChuModel.getBaricIndex());
749 818 //孕前体重
750   - antChuJson.put("yqWeight", StringUtils.unitHandle(antExChuModel.getYqWeight(), UnitConstants.KG));
  819 + antChuJson.put("yqWeight", antExChuModel.getYqWeight());
751 820 // 血压
752 821 String ssy = "";
753 822 String szy = "";
754 823  
755 824  
... ... @@ -757,13 +826,14 @@
757 826 szy = chBpMap.get("szy");
758 827 }
759 828 //血压
760   - antChuJson.put("bp", StringUtils.unitHandle(ssy + "/" + szy, UnitConstants.MMHG));
  829 + antChuJson.put("bp", ssy + "/" + szy);
761 830  
762 831 //流产
763 832 StringBuffer abortion = new StringBuffer();
  833 + //流产
764 834 if (antExChuModel.getAbortion() != null) {
765 835 boolean isAppend = false;
766   - abortion.append(StringUtils.unitHandle(antExChuModel.getAbortion(), UnitConstants.CI) == null ? "" : StringUtils.unitHandle(antExChuModel.getAbortion(), UnitConstants.CI));
  836 + abortion.append(StringUtils.unitHandle(antExChuModel.getAbortion(), UnitConstants.CI));
767 837 if (antExChuModel.getAbortionZR() != null || antExChuModel.getAbortionRG() != null || antExChuModel.getYaowu() != null) {
768 838 isAppend = true;
769 839 abortion.append("（");
... ... @@ -784,7 +854,9 @@
784 854 }
785 855 }
786 856 //流产
787   - antChuJson.put("abortion", abortion);
  857 + antChuJson.put("abortion", abortion.toString());
  858 + //孕产史
  859 + antChuJson.put("hisGestation", "孕次:"+StringUtils.unitHandle(antExChuModel.getPregnancyTimes(), UnitConstants.CI)+" 产次:"+StringUtils.unitHandle(antExChuModel.getProdTime(), UnitConstants.CI)+" 流产次:"+StringUtils.unitHandle(antExChuModel.getAbortion(), UnitConstants.CI));
788 860 try {
789 861 //国家高危+自定义高危
790 862 List highrisks = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
... ... @@ -887,7 +959,7 @@
887 959 antChuJson.put("bld", antExChuModel.getBld());
888 960 antChuJson.put("ncgOther", antExChuModel.getNcgOther());
889 961 //血糖
890   - antChuJson.put("bloodSugar", StringUtils.unitHandle(antExChuModel.getBloodSugar(), UnitConstants.MMOLL));
  962 + antChuJson.put("bloodSugar", antExChuModel.getBloodSugar());
891 963 /**肝功能**/
892 964 antChuJson.put("xqgbzam", StringUtils.unitHandle(antExChuModel.getXqgbzam(), UnitConstants.UL));
893 965 antChuJson.put("xqgczam", StringUtils.unitHandle(antExChuModel.getXqgczam(), UnitConstants.UL));
894 966  
... ... @@ -911,13 +983,14 @@
911 983  
912 984  
913 985  
914   - //孕前体重指数 yqWeight
  986 +
915 987 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExChuModel.getYqWeight()) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExChuModel.getHeight())) {
916 988 try {
917 989 //体重指数计算规则：孕前体重/身高（单位米）的平方
918 990 java.text.DecimalFormat df = new java.text.DecimalFormat("#.#");
919 991 double tzzs = Double.parseDouble(antExChuModel.getYqWeight()) / Math.pow(Double.parseDouble(antExChuModel.getHeight()) / 100, 2);
920   - antChuJson.put("tzzs", StringUtils.unitHandle(df.format(tzzs), UnitConstants.BMI));
  992 + //孕前体重指数 yqWeight
  993 + antChuJson.put("tzzs", df.format(tzzs));
921 994 } catch (Exception e) {
922 995 ExceptionUtils.catchException(e, "体重指数计算错误");
923 996 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ cbd4ee4
... ... @@ -157,7 +157,6 @@
157 157 private CdfyHisService cdfyHisService;
158 158  
159 159  
160   -
161 160 /**
162 161 * 根据患者的建档ID，查询还未使用的免费产检查券
163 162 *
... ... @@ -267,8 +266,7 @@
267 266  
268 267  
269 268 //承德市妇幼通过就诊卡号查询到病人id保存下来
270   - if ("2100001291".equals(patient.getHospitalId()) && StringUtils.isNotEmpty(yunRequest.getVcCardNo()))
271   - {
  269 + if ("2100001291".equals(patient.getHospitalId()) && StringUtils.isNotEmpty(yunRequest.getVcCardNo())) {
272 270 patient.setBlNum(cdfyHisService.getIdByVcCardNo(yunRequest.getVcCardNo()));
273 271 }
274 272  
275 273  
... ... @@ -404,10 +402,11 @@
404 402  
405 403 /**
406 404 * 添加或更新追访信息
  405 + *
407 406 * @param userId
408 407 * @param patient
409 408 */
410   - public void addTrackDownInfo(final Integer userId, final Patients patient) {
  409 + public void addTrackDownInfo(final Integer userId, final Patients patient) {
411 410  
412 411 commonThreadPool.execute(new Runnable() {
413 412 @Override
414 413  
415 414  
416 415  
417 416  
... ... @@ -425,20 +424,20 @@
425 424 } else {//不存在查询居民健康档案是否存在追访
426 425 downRecordQuery = new TrackDownRecordQuery();
427 426 downRecordQuery.setHospitalId(patient.getHospitalId());
428   - if(StringUtils.isNotEmpty(patient.getCardNo())){
  427 + if (StringUtils.isNotEmpty(patient.getCardNo())) {
429 428 downRecordQuery.setCardNo(patient.getCardNo());
430   - }else if(StringUtils.isNotEmpty(patient.getPhone())){
  429 + } else if (StringUtils.isNotEmpty(patient.getPhone())) {
431 430 downRecordQuery.setPhone(patient.getPhone());
432 431 }
433 432 records = trackDownRecordService.queryTrackDown(downRecordQuery);
434   - if(CollectionUtils.isNotEmpty(records)){
  433 + if (CollectionUtils.isNotEmpty(records)) {
435 434 TrackDownRecord trackDownRecord1 = records.get(0);
436 435 trackDownRecord.setId(trackDownRecord1.getId());
437 436 }
438 437 }
439   - int week = DateUtil.getWeek2(patient.getLastMenses(),new Date());
  438 + int week = DateUtil.getWeek2(patient.getLastMenses(), new Date());
440 439  
441   - if(week>20){//不能做产前筛查追访，产前检查追访
  440 + if (week > 20) {//不能做产前筛查追访，产前检查追访
442 441 trackDownRecord.setTrackType(TrackDownDateEnums.I.getId());
443 442 }
444 443  
... ... @@ -852,7 +851,7 @@
852 851 yunBookbuildingService.updatePregnant(patient, id);
853 852  
854 853 //更新产后追访信息
855   - addTrackDownInfo(userId,patient);
  854 + addTrackDownInfo(userId, patient);
856 855  
857 856 operateLogFacade.addModifyOptLog(userId, Integer.valueOf(beforePatient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改");
858 857  
859 858  
860 859  
... ... @@ -908,21 +907,18 @@
908 907 //只查询当前医院所在市的所有建档记录
909 908 Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
910 909 List<String> hids = new ArrayList<>();
911   - if (org != null)
912   - {
  910 + if (org != null) {
913 911 OrganizationQuery query = new OrganizationQuery();
914 912 query.setYn(YnEnums.YES.getId());
915 913 query.setCityId(org.getCityId());
916 914 query.setProvinceId(org.getProvinceId());
917 915 List<Organization> list = organizationService.queryHospitalIds(query);
918   - if (CollectionUtils.isNotEmpty(list))
919   - {
  916 + if (CollectionUtils.isNotEmpty(list)) {
920 917 for (Organization organization : list) {
921 918 hids.add(String.valueOf(organization.getId()));
922 919 }
923 920 }
924   - if (CollectionUtils.isNotEmpty(hids))
925   - {
  921 + if (CollectionUtils.isNotEmpty(hids)) {
926 922 patientsQuery.setHospitalList(hids);
927 923 }
928 924 }
929 925  
... ... @@ -937,13 +933,10 @@
937 933 patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(bookbuildingQueryRequest.getVcCardNo()));
938 934 }
939 935 //承德通过就诊卡号查询查询到病人id 然后用病人id和就诊卡号查询建档记录
940   - else if ("2100001291".equals(hospitalId))
941   - {
  936 + else if ("2100001291".equals(hospitalId)) {
942 937 String blNum = cdfyHisService.getIdByVcCardNo(bookbuildingQueryRequest.getVcCardNo());
943 938 patientsQuery.setBlNum(blNum);
944   - }
945   - else
946   - {
  939 + } else {
947 940 patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo());
948 941 }
949 942  
950 943  
... ... @@ -951,11 +944,9 @@
951 944 //优先查询本院通过就诊卡
952 945 List<Patients> localPatients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
953 946  
954   - if ("2100001291".equals(hospitalId))
955   - {
  947 + if ("2100001291".equals(hospitalId)) {
956 948 patientsQuery.setBlNum(null);
957   - if (CollectionUtils.isEmpty(localPatients))
958   - {
  949 + if (CollectionUtils.isEmpty(localPatients)) {
959 950 patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo());
960 951 localPatients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
961 952 }
962 953  
... ... @@ -1230,19 +1221,26 @@
1230 1221 patient.setServiceType(yunRequest.getServiceType());
1231 1222 // patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
1232 1223  
1233   - //建档开通增值服务,以前数据
1234   - if (CollectionUtils.isNotEmpty(yunRequest.getSerInfos())) {
1235   - for (Map<String, String> serInfo : yunRequest.getSerInfos()) {
1236   - //标准服务
1237   - if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.bzfw.getId()) {
1238   - patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
1239   - patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
1240   - } else if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.yqjzzd.getId()) {//增值服务：修改为孕期精准指导
1241   - patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
1242   - patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
1243   - break;
  1224 + try {
  1225 + //建档开通增值服务,以前数据
  1226 + if (CollectionUtils.isNotEmpty(yunRequest.getSerInfos())) {
  1227 + for (Map<String, String> serInfo : yunRequest.getSerInfos()) {
  1228 + if(serInfo.get("serType")==null){
  1229 + continue;
  1230 + }
  1231 + //标准服务
  1232 + if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.bzfw.getId()) {
  1233 + patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
  1234 + patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
  1235 + } else if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.yqjzzd.getId()) {//增值服务：修改为孕期精准指导
  1236 + patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
  1237 + patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
  1238 + break;
  1239 + }
1244 1240 }
1245 1241 }
  1242 + } catch (Exception e) {
  1243 + e.printStackTrace();
1246 1244 }
1247 1245  
1248 1246 patient.setDueDate(DateUtil.parseYMD(yunRequest.getDueDate()));