jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5cc62edadeb83efb9627c03573fb0754611db344

Authored by wtt
1 parent 29a3ed9f61
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 86 additions and 90 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java View file @ 5cc62ed
... ... @@ -149,14 +149,14 @@
149 149 public BaseResponse add(BabyNutritionSpecialtyRequest request, Integer userId) {
150 150  
151 151 String hospitalId = autoMatchFacade.getHospitalId(userId);
152   - //表示区域的
  152 + /*//表示区域的
153 153 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
154 154 String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1);
155 155 if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) {
156 156 //打印日志
157 157 }
158 158 request.setBuildId(parentId);
159   - }
  159 + }*/
160 160 BabyNutritionSpecialtyModel model = getBabyNutritionSpecialtyModel(request);
161 161 model.setCreateDate(new Date());
162 162 model.setHospitalId(hospitalId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java View file @ 5cc62ed
... ... @@ -176,14 +176,14 @@
176 176 public BaseResponse addBabyPsychologist(BabyPsychologistRequest request, Integer userId) {
177 177  
178 178 String hospitalId = autoMatchFacade.getHospitalId(userId);
179   - //表示区域的
  179 + /* //表示区域的
180 180 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
181 181 String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1);
182 182 if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) {
183 183 //打印日志
184 184 }
185 185 request.setBuildId(parentId);
186   - }
  186 + }*/
187 187 BabyPsychologistModel model = getBabyPsychologistModel(request);
188 188 model.setCreateDate(new Date());
189 189 model.setHospitalId(hospitalId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java View file @ 5cc62ed
... ... @@ -184,14 +184,14 @@
184 184 public BaseResponse add(BabyStuntingRequest request, Integer userId) {
185 185  
186 186 String hospitalId = autoMatchFacade.getHospitalId(userId);
187   - //表示区域的
  187 + /* //表示区域的
188 188 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
189 189 String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1);
190 190 if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) {
191 191 //打印日志
192 192 }
193 193 request.setBuildId(parentId);
194   - }
  194 + }*/
195 195 BabyStuntingModel model = getBabyStuntingModel(request);
196 196 model.setCreateDate(new Date());
197 197 model.setHospitalId(hospitalId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java View file @ 5cc62ed
... ... @@ -11,7 +11,7 @@
11 11 import java.util.List;
12 12 import java.util.Map;
13 13  
14   -public class BabyNutritionSpecialtyResult implements IBasicResultConvert<BabyNutritionSpecialtyResult, BabyNutritionSpecialtyModel> {
  14 +public class BabyNutritionSpecialtyResult implements IBasicResultConvert <BabyNutritionSpecialtyResult, BabyNutritionSpecialtyModel> {
15 15  
16 16  
17 17 /*基础信息*/
18 18  
... ... @@ -26,10 +26,10 @@
26 26 //备注
27 27 private String mremark;
28 28 // 母亲高危因素
29   - List<Map<String, Object>> mHighRiskReason;
  29 + List <Map <String, Object>> mHighRiskReason;
30 30 /*母亲信息*/
31 31 //母亲姓名
32   - private String mname;
  32 + private String mname;
33 33 //母亲证件号
34 34 private String mcertNo;
35 35 //母亲手机号码
36 36  
37 37  
38 38  
... ... @@ -37,15 +37,15 @@
37 37  
38 38 /*儿童信息*/
39 39 //儿童姓名
40   - private String name;
  40 + private String name;
41 41 // 儿童编码格式20200721001
42 42 private String encoded;
43 43 //儿童证件号
44   - private String certNo;
  44 + private String certNo;
45 45 //儿童性别
46   - private String sex;
  46 + private String sex;
47 47 //儿童就诊卡号
48   - private String vcCardNo;
  48 + private String vcCardNo;
49 49 //儿童社保卡
50 50 private String sINCard;
51 51 //儿童生日
52 52  
... ... @@ -74,10 +74,10 @@
74 74 //开始管理日期
75 75 private String startMdate;
76 76 //出生史true是选中 默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴
77   - private Map<String, Object> birthHistory;
  77 + private Map <String, Object> birthHistory;
78 78 private String birthHistoryStr;
79 79 //6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
80   - private Map<String, Object> feedingHistory6;
  80 + private Map <String, Object> feedingHistory6;
81 81 private String feedingHistory6Str;
82 82 //开始食物转换年龄
83 83 private String foodToAge;
84 84  
... ... @@ -100,10 +100,10 @@
100 100 //母孕期贫血情况：Hb
101 101 private String myqpxHb;
102 102 //铁剂治疗 yw:药物 jl:剂量 lc:疗程
103   - private Map<String, Object> tjzl;
  103 + private Map <String, Object> tjzl;
104 104 private String tjzlStr;
105 105 //母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
106   - private Map<String, Object> mrwyHistory;
  106 + private Map <String, Object> mrwyHistory;
107 107 private String mrwyHistoryStr;
108 108 //儿童开始添加含铁食物年龄
109 109 private String kstjhtswage;
110 110  
111 111  
... ... @@ -114,13 +114,13 @@
114 114 //治疗（药物、剂量）
115 115 private String treatment;
116 116 //母孕期和哺乳期 wbc:true rzbz:true xzjl:true
117   - private Map<String, Object> myqbrq;
  117 + private Map <String, Object> myqbrq;
118 118 private String myqbrqStr;
119 119 //儿童服用VitD wu:true 无 you:true 有 month:月 day:天 pm:品名 jl:剂量
120   - private Map<String, Object> vitd;
  120 + private Map <String, Object> vitd;
121 121 private String vitdStr;
122 122 //体征 fl:true 方颅□ lgcz:true 肋骨串珠□ lrggk:true 肋软骨沟□ jxk:true 鸡胸□ szk:true 手(足)镯□ xxt:true X型腿□ oxtk:true O型腿□
123   - private Map<String, Object> tiz;
  123 + private Map <String, Object> tiz;
124 124 private String tizStr;
125 125 //血液检查
126 126 private String bloodCheck;
127 127  
128 128  
129 129  
... ... @@ -268,19 +268,19 @@
268 268 this.startMdate = startMdate;
269 269 }
270 270  
271   - public Map<String, Object> getBirthHistory() {
  271 + public Map <String, Object> getBirthHistory() {
272 272 return birthHistory;
273 273 }
274 274  
275   - public void setBirthHistory(Map<String, Object> birthHistory) {
  275 + public void setBirthHistory(Map <String, Object> birthHistory) {
276 276 this.birthHistory = birthHistory;
277 277 }
278 278  
279   - public Map<String, Object> getFeedingHistory6() {
  279 + public Map <String, Object> getFeedingHistory6() {
280 280 return feedingHistory6;
281 281 }
282 282  
283   - public void setFeedingHistory6(Map<String, Object> feedingHistory6) {
  283 + public void setFeedingHistory6(Map <String, Object> feedingHistory6) {
284 284 this.feedingHistory6 = feedingHistory6;
285 285 }
286 286  
287 287  
288 288  
289 289  
... ... @@ -364,19 +364,19 @@
364 364 this.myqpxHb = myqpxHb;
365 365 }
366 366  
367   - public Map<String, Object> getTjzl() {
  367 + public Map <String, Object> getTjzl() {
368 368 return tjzl;
369 369 }
370 370  
371   - public void setTjzl(Map<String, Object> tjzl) {
  371 + public void setTjzl(Map <String, Object> tjzl) {
372 372 this.tjzl = tjzl;
373 373 }
374 374  
375   - public Map<String, Object> getMrwyHistory() {
  375 + public Map <String, Object> getMrwyHistory() {
376 376 return mrwyHistory;
377 377 }
378 378  
379   - public void setMrwyHistory(Map<String, Object> mrwyHistory) {
  379 + public void setMrwyHistory(Map <String, Object> mrwyHistory) {
380 380 this.mrwyHistory = mrwyHistory;
381 381 }
382 382  
383 383  
384 384  
385 385  
386 386  
387 387  
... ... @@ -412,27 +412,27 @@
412 412 this.treatment = treatment;
413 413 }
414 414  
415   - public Map<String, Object> getMyqbrq() {
  415 + public Map <String, Object> getMyqbrq() {
416 416 return myqbrq;
417 417 }
418 418  
419   - public void setMyqbrq(Map<String, Object> myqbrq) {
  419 + public void setMyqbrq(Map <String, Object> myqbrq) {
420 420 this.myqbrq = myqbrq;
421 421 }
422 422  
423   - public Map<String, Object> getVitd() {
  423 + public Map <String, Object> getVitd() {
424 424 return vitd;
425 425 }
426 426  
427   - public void setVitd(Map<String, Object> vitd) {
  427 + public void setVitd(Map <String, Object> vitd) {
428 428 this.vitd = vitd;
429 429 }
430 430  
431   - public Map<String, Object> getTiz() {
  431 + public Map <String, Object> getTiz() {
432 432 return tiz;
433 433 }
434 434  
435   - public void setTiz(Map<String, Object> tiz) {
  435 + public void setTiz(Map <String, Object> tiz) {
436 436 this.tiz = tiz;
437 437 }
438 438  
439 439  
... ... @@ -660,11 +660,11 @@
660 660 this.mremark = mremark;
661 661 }
662 662  
663   - public List<Map<String, Object>> getmHighRiskReason() {
  663 + public List <Map <String, Object>> getmHighRiskReason() {
664 664 return mHighRiskReason;
665 665 }
666 666  
667   - public void setmHighRiskReason(List<Map<String, Object>> mHighRiskReason) {
  667 + public void setmHighRiskReason(List <Map <String, Object>> mHighRiskReason) {
668 668 this.mHighRiskReason = mHighRiskReason;
669 669 }
670 670 /*新增页面 4个页面内容*/
671 671  
672 672  
... ... @@ -684,11 +684,11 @@
684 684 setName(destModel.getName());
685 685 setEncoded(destModel.getEncoded());
686 686 setCertNo(destModel.getCertNo());
687   - if(destModel.getSex()==0){
  687 + if (destModel.getSex() == 0) {
688 688 setSex("女");
689   - }else if(destModel.getSex()==1){
  689 + } else if (destModel.getSex() == 1) {
690 690 setSex("男");
691   - }else {
  691 + } else {
692 692 setSex("_");
693 693 }
694 694 setVcCardNo(destModel.getVcCardNo());
695 695  
... ... @@ -731,9 +731,9 @@
731 731 setVitdzl(destModel.getVitdzl());
732 732  
733 733  
734   -
735 734 return this;
736 735 }
  736 +
737 737 public BabyNutritionSpecialtyResult convertToShowResult(BabyNutritionSpecialtyModel destModel) {
738 738  
739 739 setId(destModel.getId());
740 740  
741 741  
... ... @@ -749,11 +749,11 @@
749 749 setName(destModel.getName());
750 750 setEncoded(destModel.getEncoded());
751 751 setCertNo(destModel.getCertNo());
752   - if(destModel.getSex()==0){
  752 + if (destModel.getSex() == 0) {
753 753 setSex("女");
754   - }else if(destModel.getSex()==1){
  754 + } else if (destModel.getSex() == 1) {
755 755 setSex("男");
756   - }else {
  756 + } else {
757 757 setSex("_");
758 758 }
759 759 setVcCardNo(destModel.getVcCardNo());
760 760  
761 761  
762 762  
... ... @@ -762,14 +762,14 @@
762 762  
763 763 setYyProject(destModel.getYyProject());
764 764  
765   - if(StringUtils.isNotEmpty(destModel.getYyProject())){
766   - if("dbznl".equals(destModel.getYyProject())){
  765 + if (StringUtils.isNotEmpty(destModel.getYyProject())) {
  766 + if ("dbznl".equals(destModel.getYyProject())) {
767 767 setYyProjectName("蛋白质-能量营养不良儿童检查");
768   - }else if ("pxet".equals(destModel.getYyProject())){
  768 + } else if ("pxet".equals(destModel.getYyProject())) {
769 769 setYyProjectName("贫血儿童检查");
770   - }else if ("jlbet".equals(destModel.getYyProject())){
  770 + } else if ("jlbet".equals(destModel.getYyProject())) {
771 771 setYyProjectName("佝偻病儿童检查");
772   - }else if ("fpetjc".equals(destModel.getYyProject())){
  772 + } else if ("fpetjc".equals(destModel.getYyProject())) {
773 773 setYyProjectName("肥胖儿童检查");
774 774 }
775 775 }
776 776  
... ... @@ -784,30 +784,26 @@
784 784 //出生史
785 785 String getBirthHistory = "";
786 786 try {
787   - if (destModel.getBirthHistory()!=null ) {
788   - Map<String, Object> map = destModel.getBirthHistory();
789   - String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString();
790   - if ("no".equals(yesOrNo)) {
791   - getBirthHistory = "无";
792   - } else if ("yes".equals(yesOrNo)) {
793   - boolean zc = map.get("zc") == null ? false : (boolean)map.get("zc");
794   - if (zc) {
795   - getBirthHistory += " 早产,";
796   - }
797   - boolean dcstz = map.get("dcstz") == null ? false : (boolean)map.get("dcstz");
798   - if (dcstz) {
799   - getBirthHistory += " 低出生体重,";
800   - }
801   - boolean dt = map.get("dt") == null ? false : (boolean)map.get("dt");
802   - if (dt) {
803   - getBirthHistory += " 多胎,";
804   - }
805   - boolean jdy = map.get("jdy") == null ? false : (boolean)map.get("jdy");
806   - if (jdy) {
807   - getBirthHistory += " 巨大婴,";
808   - }
809   - getBirthHistory = FunvCommonUtil.spitd(getBirthHistory);
  787 + if (destModel.getBirthHistory() != null) {
  788 + Map <String, Object> map = destModel.getBirthHistory();
  789 + boolean zc = map.get("zc") == null ? false : (boolean) map.get("zc");
  790 + if (zc) {
  791 + getBirthHistory += " 早产,";
810 792 }
  793 + boolean dcstz = map.get("dcstz") == null ? false : (boolean) map.get("dcstz");
  794 + if (dcstz) {
  795 + getBirthHistory += " 低出生体重,";
  796 + }
  797 + boolean dt = map.get("dt") == null ? false : (boolean) map.get("dt");
  798 + if (dt) {
  799 + getBirthHistory += " 多胎,";
  800 + }
  801 + boolean jdy = map.get("jdy") == null ? false : (boolean) map.get("jdy");
  802 + if (jdy) {
  803 + getBirthHistory += " 巨大婴,";
  804 + }
  805 + getBirthHistory = FunvCommonUtil.spitd(getBirthHistory);
  806 +
811 807 }
812 808 } catch (Exception e) {
813 809 e.printStackTrace();
814 810  
815 811  
816 812  
... ... @@ -817,18 +813,18 @@
817 813 //6个月内喂养史
818 814 String getFeedingHistory6 = "";
819 815 try {
820   - if (destModel.getFeedingHistory6()!=null ) {
821   - Map<String, Object> map = destModel.getFeedingHistory6();
  816 + if (destModel.getFeedingHistory6() != null) {
  817 + Map <String, Object> map = destModel.getFeedingHistory6();
822 818  
823   - boolean cmr = map.get("cmr") == null ? false : (boolean)map.get("cmr");
  819 + boolean cmr = map.get("cmr") == null ? false : (boolean) map.get("cmr");
824 820 if (cmr) {
825 821 getFeedingHistory6 += " 纯母乳,";
826 822 }
827   - boolean bfmr = map.get("bfmr") == null ? false : (boolean)map.get("bfmr");
  823 + boolean bfmr = map.get("bfmr") == null ? false : (boolean) map.get("bfmr");
828 824 if (bfmr) {
829 825 getFeedingHistory6 += " 部分母乳,";
830 826 }
831   - boolean pfn = map.get("pfn") == null ? false : (boolean)map.get("pfn");
  827 + boolean pfn = map.get("pfn") == null ? false : (boolean) map.get("pfn");
832 828 if (pfn) {
833 829 getFeedingHistory6 += " 配方奶,";
834 830 }
835 831  
836 832  
837 833  
... ... @@ -856,18 +852,18 @@
856 852 //母乳喂养情况
857 853 String getMrwyHistory = "";
858 854 try {
859   - if (destModel.getMrwyHistory()!=null ) {
860   - Map<String, Object> map = destModel.getMrwyHistory();
  855 + if (destModel.getMrwyHistory() != null) {
  856 + Map <String, Object> map = destModel.getMrwyHistory();
861 857  
862   - boolean cmr = map.get("cmr") == null ? false : (boolean)map.get("cmr");
  858 + boolean cmr = map.get("cmr") == null ? false : (boolean) map.get("cmr");
863 859 if (cmr) {
864 860 getMrwyHistory += " 纯母乳,";
865 861 }
866   - boolean bfmr = map.get("bfmr") == null ? false : (boolean)map.get("bfmr");
  862 + boolean bfmr = map.get("bfmr") == null ? false : (boolean) map.get("bfmr");
867 863 if (bfmr) {
868 864 getMrwyHistory += " 部分母乳,";
869 865 }
870   - boolean pfn = map.get("pfn") == null ? false : (boolean)map.get("pfn");
  866 + boolean pfn = map.get("pfn") == null ? false : (boolean) map.get("pfn");
871 867 if (pfn) {
872 868 getMrwyHistory += " 配方奶,";
873 869 }
874 870  
875 871  
876 872  
877 873  
878 874  
879 875  
880 876  
... ... @@ -891,34 +887,34 @@
891 887 //体征
892 888 String getTiz = "";
893 889 try {
894   - if (destModel.getTiz()!=null ) {
895   - Map<String, Object> map = destModel.getTiz();
  890 + if (destModel.getTiz() != null) {
  891 + Map <String, Object> map = destModel.getTiz();
896 892  
897   - boolean fl = map.get("fl") == null ? false : (boolean)map.get("fl");
  893 + boolean fl = map.get("fl") == null ? false : (boolean) map.get("fl");
898 894 if (fl) {
899 895 getTiz += " 方颅,";
900 896 }
901   - boolean lgcz = map.get("lgcz") == null ? false : (boolean)map.get("lgcz");
  897 + boolean lgcz = map.get("lgcz") == null ? false : (boolean) map.get("lgcz");
902 898 if (lgcz) {
903 899 getTiz += " 肋骨串珠,";
904 900 }
905   - boolean lrggk = map.get("lrggk") == null ? false : (boolean)map.get("lrggk");
  901 + boolean lrggk = map.get("lrggk") == null ? false : (boolean) map.get("lrggk");
906 902 if (lrggk) {
907 903 getTiz += " 肋软骨沟,";
908 904 }
909   - boolean jxk = map.get("jxk") == null ? false : (boolean)map.get("jxk");
  905 + boolean jxk = map.get("jxk") == null ? false : (boolean) map.get("jxk");
910 906 if (jxk) {
911 907 getTiz += " 鸡胸,";
912 908 }
913   - boolean szk = map.get("szk") == null ? false : (boolean)map.get("szk");
  909 + boolean szk = map.get("szk") == null ? false : (boolean) map.get("szk");
914 910 if (szk) {
915 911 getTiz += " 手(足)镯,";
916 912 }
917   - boolean xxt = map.get("xxt") == null ? false : (boolean)map.get("xxt");
  913 + boolean xxt = map.get("xxt") == null ? false : (boolean) map.get("xxt");
918 914 if (xxt) {
919 915 getTiz += " X型腿,";
920 916 }
921   - boolean oxtk = map.get("oxtk") == null ? false : (boolean)map.get("oxtk");
  917 + boolean oxtk = map.get("oxtk") == null ? false : (boolean) map.get("oxtk");
922 918 if (oxtk) {
923 919 getTiz += " O型腿,";
924 920 }