jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1e8b343b0fd37326c71c8dd3acf5913c2c33cce8

Authored by jiangjiazhi
2 parents 3e92e4660e 4c5bb9102e
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-biz-service/src/main/resources/mainOrm/Organization.xml View file @ 1e8b343
... ... @@ -99,7 +99,7 @@
99 99  
100 100  
101 101 <select id="getOrganization" resultMap="OrganizationResultMap" parameterType="java.lang.Integer">
102   -select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id
  102 +select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status
103 103 from organization where id = #{id,jdbcType=INTEGER}
104 104 </select>
105 105  
platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java View file @ 1e8b343
... ... @@ -50,6 +50,7 @@
50 50 //高危配置
51 51 private String highConfig;
52 52  
  53 +
53 54 public String getHighConfig() {
54 55 return highConfig;
55 56 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java View file @ 1e8b343
... ... @@ -156,7 +156,7 @@
156 156 */
157 157 public List<BasicConfigResult> getBaseicConfigByParentId(String parentId) {
158 158 BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
159   - basicConfigQuery.setNeed("1");
  159 +// basicConfigQuery.setNeed("1");
160 160 basicConfigQuery.setYn(YnEnums.YES.getId());
161 161 basicConfigQuery.setParentId(parentId);
162 162 List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ 1e8b343
... ... @@ -378,7 +378,7 @@
378 378 String address = org.getAddress();
379 379 allAddress+=address;
380 380 hospital.put("address", allAddress);
381   - hospital.put("status",org.getStatus()+"");
  381 + hospital.put("status",org.getStatus() == null ? "" : String.valueOf(org.getStatus()));
382 382 hospital.put("remark", "");
383 383 }
384 384 SmsConfigQuery query = new SmsConfigQuery();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ 1e8b343
... ... @@ -68,8 +68,6 @@
68 68 //儿童性别
69 69 private Integer sex;
70 70 //儿童身份证
71   - @FormParam
72   - @NotEmpty(message = "儿童身份证号不能为空")
73 71 private String babyCardNo;
74 72 //儿童生日
75 73 @FormParam
... ... @@ -85,9 +83,7 @@
85 83  
86 84 /***********儿童出生信息***********/
87 85  
88   - //预产期
89   - @FormParam
90   - @NotEmpty(message = "预产期不能为空")
  86 + //分娩日期
91 87 private String dueDate;
92 88 //分娩方式
93 89 private String dueType;
... ... @@ -127,8 +123,6 @@
127 123 private Integer serviceStatus;
128 124  
129 125 //就诊卡号
130   - @FormParam
131   - @NotEmpty(message = "就诊卡号不能为空")
132 126 private String vcCardNo;
133 127  
134 128 @FormParam