jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f03478b2bac5b1a34ae4e3c1e4d97f03e987fcbb

Authored by liquanyu
2 parents 4ae92e36dd 1c66288715
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java View file @ f03478b
... ... @@ -190,6 +190,12 @@
190 190 //初诊页面的现病史
191 191 private String presentIllness;
192 192  
  193 +
  194 + //发育迟缓专科检查 cz初诊，fz复诊
  195 + private String czOrfzProject;
  196 + private String czOrfzProjectName;
  197 +
  198 +
193 199 public String getCjfy() {
194 200 return cjfy;
195 201 }
... ... @@ -835,5 +841,20 @@
835 841 return serialVersionUID;
836 842 }
837 843  
  844 + public String getCzOrfzProject() {
  845 + return czOrfzProject;
  846 + }
  847 +
  848 + public void setCzOrfzProject(String czOrfzProject) {
  849 + this.czOrfzProject = czOrfzProject;
  850 + }
  851 +
  852 + public String getCzOrfzProjectName() {
  853 + return czOrfzProjectName;
  854 + }
  855 +
  856 + public void setCzOrfzProjectName(String czOrfzProjectName) {
  857 + this.czOrfzProjectName = czOrfzProjectName;
  858 + }
838 859 }
platform-dal/src/main/java/com/lyms/platform/query/BabyPsychologistModelQuery.java View file @ f03478b
... ... @@ -46,6 +46,12 @@
46 46  
47 47 private String sort;
48 48  
  49 + //发育迟缓专科检查 cz初诊，fz复诊
  50 + private String czOrfzProject;
  51 +
  52 + private String czOrfzProjectName;
  53 +
  54 +
49 55 @Override
50 56 public String getSort() {
51 57 return sort;
... ... @@ -186,6 +192,22 @@
186 192 this.checkDateEnd = checkDateEnd;
187 193 }
188 194  
  195 + public String getCzOrfzProject() {
  196 + return czOrfzProject;
  197 + }
  198 +
  199 + public void setCzOrfzProject(String czOrfzProject) {
  200 + this.czOrfzProject = czOrfzProject;
  201 + }
  202 +
  203 + public String getCzOrfzProjectName() {
  204 + return czOrfzProjectName;
  205 + }
  206 +
  207 + public void setCzOrfzProjectName(String czOrfzProjectName) {
  208 + this.czOrfzProjectName = czOrfzProjectName;
  209 + }
  210 +
189 211 @Override
190 212 public MongoQuery convertToQuery() {
191 213 MongoCondition condition = MongoCondition.newInstance();
... ... @@ -220,6 +242,16 @@
220 242  
221 243 condition = condition.and("xlzkProject", xlzkProject, MongoOper.IS);
222 244 }
  245 +
  246 + if (StringUtils.isNotEmpty(czOrfzProject)) {
  247 +
  248 + condition = condition.and("czOrfzProject", czOrfzProject, MongoOper.IS);
  249 + }
  250 +
  251 +// if (StringUtils.isNotEmpty(czOrfzProjectName)) {
  252 +//
  253 +// condition = condition.and("czOrfzProjectName", czOrfzProjectName, MongoOper.IS);
  254 +// }
223 255  
224 256  
225 257 Criteria c = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java View file @ f03478b
... ... @@ -158,6 +158,8 @@
158 158 model.setFzOther(request.getFzOther());
159 159 model.setCjfy(request.getCjfy());
160 160 model.setPresentIllness(request.getPresentIllness());
  161 + model.setCzOrfzProject(request.getCzOrfzProject());
  162 +// model.setCzOrfzProjectName(request.getCzOrfzProjectName());
161 163 return model;
162 164  
163 165 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java View file @ f03478b
... ... @@ -183,6 +183,12 @@
183 183 //初诊页面的现病史
184 184 private String presentIllness;
185 185  
  186 + //发育迟缓专科检查 cz初诊，fz复诊
  187 + private String czOrfzProject;
  188 +
  189 + private String czOrfzProjectName;
  190 +
  191 +
186 192 public String getCjfy() {
187 193 return cjfy;
188 194 }
... ... @@ -805,6 +811,22 @@
805 811  
806 812 public void setPresentIllness(String presentIllness) {
807 813 this.presentIllness = presentIllness;
  814 + }
  815 +
  816 + public String getCzOrfzProject() {
  817 + return czOrfzProject;
  818 + }
  819 +
  820 + public void setCzOrfzProject(String czOrfzProject) {
  821 + this.czOrfzProject = czOrfzProject;
  822 + }
  823 +
  824 + public String getCzOrfzProjectName() {
  825 + return czOrfzProjectName;
  826 + }
  827 +
  828 + public void setCzOrfzProjectName(String czOrfzProjectName) {
  829 + this.czOrfzProjectName = czOrfzProjectName;
808 830 }
809 831 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java View file @ f03478b
... ... @@ -29,7 +29,7 @@
29 29  
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 //儿童生日
... ... @@ -185,6 +185,10 @@
185 185 //初诊页面的现病史
186 186 private String presentIllness;
187 187  
  188 + //发育迟缓专科检查 cz初诊，fz复诊
  189 + private String czOrfzProject;
  190 + private String czOrfzProjectName;
  191 +
188 192 public String getCjfy() {
189 193 return cjfy;
190 194 }
... ... @@ -841,6 +845,22 @@
841 845 this.presentIllness = presentIllness;
842 846 }
843 847  
  848 + public String getCzOrfzProject() {
  849 + return czOrfzProject;
  850 + }
  851 +
  852 + public void setCzOrfzProject(String czOrfzProject) {
  853 + this.czOrfzProject = czOrfzProject;
  854 + }
  855 +
  856 + public String getCzOrfzProjectName() {
  857 + return czOrfzProjectName;
  858 + }
  859 +
  860 + public void setCzOrfzProjectName(String czOrfzProjectName) {
  861 + this.czOrfzProjectName = czOrfzProjectName;
  862 + }
  863 +
844 864 @Override
845 865 public BabyPsychologistResult convertToResult(BabyPsychologistModel destModel) {
846 866  
847 867  
848 868  
... ... @@ -857,11 +877,11 @@
857 877 setName(destModel.getName());
858 878 setEncoded(destModel.getEncoded());
859 879 setCertNo(destModel.getCertNo());
860   - if(destModel.getSex()==0){
  880 + if (destModel.getSex() == 0) {
861 881 setSex("女");
862   - }else if(destModel.getSex()==1){
  882 + } else if (destModel.getSex() == 1) {
863 883 setSex("男");
864   - }else {
  884 + } else {
865 885 setSex("_");
866 886 }
867 887 setVcCardNo(destModel.getVcCardNo());
868 888  
869 889  
870 890  
871 891  
872 892  
873 893  
874 894  
875 895  
... ... @@ -869,24 +889,24 @@
869 889 setBirthday(DateUtil.getYyyyMmDd(destModel.getBirthday()));
870 890  
871 891 setXlzkProject(destModel.getXlzkProject());
872   - if(StringUtils.isNotEmpty(destModel.getXlzkProject())){
873   - if("zlza".equals(destModel.getXlzkProject())){
  892 + if (StringUtils.isNotEmpty(destModel.getXlzkProject())) {
  893 + if ("zlza".equals(destModel.getXlzkProject())) {
874 894 setXlzkProjectName("智力障碍病历");
875   - }else if ("gdzpxza".equals(destModel.getXlzkProject())){
  895 + } else if ("gdzpxza".equals(destModel.getXlzkProject())) {
876 896 setXlzkProjectName("孤独症谱系障碍病历");
877   - }else if ("yyza".equals(destModel.getXlzkProject())){
  897 + } else if ("yyza".equals(destModel.getXlzkProject())) {
878 898 setXlzkProjectName("语言障碍病历");
879   - }else if ("gyza".equals(destModel.getXlzkProject())){
  899 + } else if ("gyza".equals(destModel.getXlzkProject())) {
880 900 setXlzkProjectName("构音障碍病历");
881   - }else if ("zylqxddza".equals(destModel.getXlzkProject())){
  901 + } else if ("zylqxddza".equals(destModel.getXlzkProject())) {
882 902 setXlzkProjectName("注意力缺陷多动障碍病历");
883   - }else if ("cdza".equals(destModel.getXlzkProject())){
  903 + } else if ("cdza".equals(destModel.getXlzkProject())) {
884 904 setXlzkProjectName("抽动障碍病历");
885   - }else if ("smza".equals(destModel.getXlzkProject())){
  905 + } else if ("smza".equals(destModel.getXlzkProject())) {
886 906 setXlzkProjectName("睡眠障碍病历");
887   - }else if ("ynz".equals(destModel.getXlzkProject())){
  907 + } else if ("ynz".equals(destModel.getXlzkProject())) {
888 908 setXlzkProjectName("遗尿症病历");
889   - }else if ("wtxw".equals(destModel.getXlzkProject())){
  909 + } else if ("wtxw".equals(destModel.getXlzkProject())) {
890 910 setXlzkProjectName("问题行为病历");
891 911 }
892 912 }
... ... @@ -951,6 +971,16 @@
951 971 setFzOther(destModel.getFzOther());
952 972 setCjfy(destModel.getCjfy());
953 973 setPresentIllness(destModel.getPresentIllness());
  974 +
  975 + //新增字段
  976 + setCzOrfzProject(destModel.getCzOrfzProject());
  977 + if (StringUtils.isNotEmpty(destModel.getCzOrfzProject())) {
  978 + if ("cz".equals(destModel.getCzOrfzProject())) {
  979 + setCzOrfzProjectName("初诊");
  980 + } else if ("fz".equals(destModel.getCzOrfzProject())) {
  981 + setCzOrfzProjectName("复诊");
  982 + }
  983 + }
954 984  
955 985 return this;
956 986 }