jiangjiazhi / regional-platform

Download as
Browse Code »

Commit eaeae1a4d93f7c4d30209f7b4e5a0f490ff994c8

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

小程序配置项

Showing 24 changed files with 745 additions and 134 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java View file @ eaeae1a
  1 +package com.lyms.platform.permission.dao.master;
  2 +
  3 +import com.lyms.platform.permission.model.CheckItemManage;
  4 +
  5 +import java.util.List;
  6 +
  7 +public interface MasterCheckItemManageMapper {
  8 +
  9 + public List<CheckItemManage> getCheckItemManageList();
  10 +
  11 + public void addCheckItem(CheckItemManage checkItemManage);
  12 +
  13 + public List<CheckItemManage> getCheckItemManage(String id);
  14 +
  15 + public Integer deleteCheckItemManage(Integer id);
  16 +
  17 + public Integer updateCheckItemManage(CheckItemManage checkItemManage);
  18 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java View file @ eaeae1a
  1 +package com.lyms.platform.permission.dao.master;
  2 +
  3 +import com.lyms.platform.permission.model.CheckItem;
  4 +
  5 +import java.util.List;
  6 +
  7 +public interface MasterCheckItemMapper {
  8 +
  9 + public List<CheckItem> getCheckItemList();
  10 +
  11 + public List getOne(Integer id);
  12 +
  13 +
  14 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java View file @ eaeae1a
... ... @@ -25,8 +25,14 @@
25 25  
26 26 void execSql(String sql);
27 27  
28   - List<Map<String,Object>> getOrganizationByAreaId(String id);
  28 + List<Map<String, Object>> getOrganizationByAreaId(String id);
29 29  
30 30 List<Organization> queryHospitalIds(OrganizationQuery organizationQuery);
  31 +
  32 + /**
  33 + * 根据医院id查询医院名称
  34 + */
  35 + public String getOrganizationName(String id);
  36 +
31 37 }
platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterRolesMapper.java View file @ eaeae1a
... ... @@ -5,7 +5,18 @@
5 5  
6 6 import java.util.List;
7 7  
8   -public interface MasterRolesMapper {public void addRoles(Roles obj);public void updateRoles(Roles obj);public void deleteRoles(Integer id);public Roles getRoles(Integer id);public int queryRolesCount(RolesQuery query);public List<Roles> queryRoles(RolesQuery query);
  8 +public interface MasterRolesMapper {
  9 + public void addRoles(Roles obj);
  10 +
  11 + public void updateRoles(Roles obj);
  12 +
  13 + public void deleteRoles(Integer id);
  14 +
  15 + public Roles getRoles(Integer id);
  16 +
  17 + public int queryRolesCount(RolesQuery query);
  18 +
  19 + public List<Roles> queryRoles(RolesQuery query);
9 20  
10 21 }
platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java View file @ eaeae1a
  1 +package com.lyms.platform.permission.model;
  2 +
  3 +public class CheckItem {
  4 + private Integer id;
  5 + private String project;
  6 + private String projectInfo;
  7 +
  8 + public Integer getId() {
  9 + return id;
  10 + }
  11 +
  12 + public void setId(Integer id) {
  13 + this.id = id;
  14 + }
  15 +
  16 + public String getProject() {
  17 + return project;
  18 + }
  19 +
  20 + public void setProject(String project) {
  21 + this.project = project;
  22 + }
  23 +
  24 +
  25 + public String getProjectInfo() {
  26 + return projectInfo;
  27 + }
  28 +
  29 + public void setProjectInfo(String projectInfo) {
  30 + this.projectInfo = projectInfo;
  31 + }
  32 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManage.java View file @ eaeae1a
  1 +package com.lyms.platform.permission.model;
  2 +
  3 +
  4 +import java.util.List;
  5 +import java.util.Map;
  6 +
  7 +public class CheckItemManage {
  8 + private Integer id;
  9 + private Integer startWeek;
  10 + private Integer endWeek;
  11 + private String checkItemInfoId;
  12 + private String affiliateId;
  13 + private List checkItemInfoName;
  14 +
  15 + private Map<String, List> ItemInfoIdMap;
  16 +
  17 + public Map<String, List> getItemInfoIdMap() {
  18 + return ItemInfoIdMap;
  19 + }
  20 +
  21 + public void setItemInfoIdMap(Map<String, List> itemInfoIdMap) {
  22 + ItemInfoIdMap = itemInfoIdMap;
  23 + }
  24 +
  25 + public List getCheckItemInfoName() {
  26 + return checkItemInfoName;
  27 + }
  28 +
  29 + public void setCheckItemInfoName(List checkItemInfoName) {
  30 + this.checkItemInfoName = checkItemInfoName;
  31 + }
  32 +
  33 + public Integer getId() {
  34 + return id;
  35 + }
  36 +
  37 + public void setId(Integer id) {
  38 + this.id = id;
  39 + }
  40 +
  41 + public Integer getStartWeek() {
  42 + return startWeek;
  43 + }
  44 +
  45 + public void setStartWeek(Integer startWeek) {
  46 + this.startWeek = startWeek;
  47 + }
  48 +
  49 + public Integer getEndWeek() {
  50 + return endWeek;
  51 + }
  52 +
  53 + public void setEndWeek(Integer endWeek) {
  54 + this.endWeek = endWeek;
  55 + }
  56 +
  57 + public String getCheckItemInfoId() {
  58 + return checkItemInfoId;
  59 + }
  60 +
  61 + public void setCheckItemInfoId(String checkItemInfoId) {
  62 + this.checkItemInfoId = checkItemInfoId;
  63 + }
  64 +
  65 + public String getAffiliateId() {
  66 + return affiliateId;
  67 + }
  68 +
  69 + public void setAffiliateId(String affiliateId) {
  70 + this.affiliateId = affiliateId;
  71 + }
  72 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java View file @ eaeae1a
  1 +package com.lyms.platform.permission.service;
  2 +
  3 +import com.lyms.platform.permission.model.CheckItemManage;
  4 +
  5 +import java.util.List;
  6 +
  7 +public interface CheckItemManageService {
  8 + public List<CheckItemManage> getCheckItemManageList();
  9 +
  10 + public void addCheckItem(CheckItemManage checkItemManage);
  11 +
  12 + public List<CheckItemManage> getCheckItemManage(String id);
  13 +
  14 + public Integer deleteCheckItemManage(Integer id);
  15 +
  16 + public Integer updateCheckItemMagage(CheckItemManage checkItemManage);
  17 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java View file @ eaeae1a
  1 +package com.lyms.platform.permission.service;
  2 +
  3 +
  4 +import com.lyms.platform.permission.model.CheckItem;
  5 +
  6 +import java.util.List;
  7 +
  8 +public interface CheckItemService {
  9 +
  10 + public List<CheckItem> getCheckItemList();
  11 +
  12 + public List getOne(Integer id);
  13 +
  14 +
  15 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java View file @ eaeae1a
... ... @@ -20,6 +20,7 @@
20 20 public List<Organization> queryOrganization(OrganizationQuery query);
21 21  
22 22 List<String> queryProvinceIdByOrgId(List<Integer> orgId);
  23 +
23 24 List<Organization> queryHospital();
24 25  
25 26 List<Organization> queryHospitals(OrganizationQuery organizationQuery);
... ... @@ -35,6 +36,12 @@
35 36  
36 37 void execSql(String sql);
37 38  
38   - List<Map<String,Object>> getOrganizationByAreaId(String id);
  39 + List<Map<String, Object>> getOrganizationByAreaId(String id);
  40 +
  41 +
  42 + /**
  43 + * 根据id查询医院名称
  44 + */
  45 + public String getOrganizationName(String id);
39 46 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java View file @ eaeae1a
  1 +package com.lyms.platform.permission.service.impl;
  2 +
  3 +import com.lyms.platform.permission.dao.master.MasterCheckItemManageMapper;
  4 +import com.lyms.platform.permission.model.CheckItemManage;
  5 +import com.lyms.platform.permission.service.CheckItemManageService;
  6 +import org.springframework.beans.factory.annotation.Autowired;
  7 +import org.springframework.stereotype.Service;
  8 +
  9 +import java.util.List;
  10 +
  11 +@Service
  12 +public class CheckItemManageServiceImpl implements CheckItemManageService {
  13 +
  14 + @Autowired
  15 + private MasterCheckItemManageMapper checkItemManageMapper;
  16 +
  17 + @Override
  18 + public List<CheckItemManage> getCheckItemManageList() {
  19 + return checkItemManageMapper.getCheckItemManageList();
  20 + }
  21 +
  22 + @Override
  23 + public void addCheckItem(CheckItemManage checkItemManage) {
  24 + checkItemManageMapper.addCheckItem(checkItemManage);
  25 + }
  26 +
  27 + @Override
  28 + public List<CheckItemManage> getCheckItemManage(String id) {
  29 +
  30 + return checkItemManageMapper.getCheckItemManage(id);
  31 + }
  32 +
  33 + @Override
  34 + public Integer deleteCheckItemManage(Integer id) {
  35 + return checkItemManageMapper.deleteCheckItemManage(id);
  36 + }
  37 +
  38 + @Override
  39 + public Integer updateCheckItemMagage(CheckItemManage checkItemManage) {
  40 + return checkItemManageMapper.updateCheckItemManage(checkItemManage);
  41 + }
  42 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java View file @ eaeae1a
  1 +package com.lyms.platform.permission.service.impl;
  2 +
  3 +import com.lyms.platform.permission.dao.master.MasterCheckItemMapper;
  4 +import com.lyms.platform.permission.model.CheckItem;
  5 +import com.lyms.platform.permission.model.CheckItemManage;
  6 +import com.lyms.platform.permission.service.CheckItemService;
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.stereotype.Service;
  9 +
  10 +import java.util.List;
  11 +
  12 +@Service
  13 +public class CheckItemServiceImpl implements CheckItemService {
  14 +
  15 + @Autowired
  16 + private MasterCheckItemMapper checkItemMapper;
  17 +
  18 + @Override
  19 + public List<CheckItem> getCheckItemList() {
  20 + return checkItemMapper.getCheckItemList();
  21 + }
  22 +
  23 + @Override
  24 + public List getOne(Integer id) {
  25 + return checkItemMapper.getOne(id);
  26 + }
  27 +
  28 +
  29 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java View file @ eaeae1a
... ... @@ -96,7 +96,7 @@
96 96 rolesList.add(rolesService.getRoles(63));
97 97 rolesList.add(rolesService.getRoles(48));
98 98 rolesList.add(rolesService.getRoles(66));
99   - for (Roles roles:rolesList) {
  99 + for (Roles roles : rolesList) {
100 100 // RolePermissionMapsQuery mapsQuery = new RolePermissionMapsQuery();
101 101 // mapsQuery.setYn(YnEnums.YES.getId());
102 102 // mapsQuery.setRoleId(roles.getId());
... ... @@ -173,7 +173,7 @@
173 173 @Override
174 174 public List<Organization> queryOrganization(OrganizationQuery query) {
175 175 if (query.getNeed() != null) {
176   - query.mysqlBuild( masterOrganizationMapper.queryOrganizationCount(query));
  176 + query.mysqlBuild(masterOrganizationMapper.queryOrganizationCount(query));
177 177 }
178 178 List<Organization> organizations = masterOrganizationMapper.queryOrganization(query);
179 179 if (CollectionUtils.isNotEmpty(organizations)) {
... ... @@ -213,7 +213,7 @@
213 213 }
214 214  
215 215 List<Organization> results = new ArrayList<>();
216   - List<Organization> organizations = masterOrganizationMapper.queryOrganization(query);
  216 + List<Organization> organizations = masterOrganizationMapper.queryOrganization(query);
217 217  
218 218 if (CollectionUtils.isNotEmpty(organizations)) {
219 219 for (Organization organization : organizations) {
220 220  
221 221  
222 222  
... ... @@ -247,27 +247,24 @@
247 247 DataPermissionsModelQuery visitQuery = new DataPermissionsModelQuery();
248 248 visitQuery.setUserId(userId);
249 249 List<DataPermissionsModel> list = dataPermissionService.queryPermission(visitQuery);
250   - if (CollectionUtils.isEmpty(list))
251   - {
  250 + if (CollectionUtils.isEmpty(list)) {
252 251 return;
253 252 }
254 253 for (DataPermissionsModel model : list) {
255 254 if (StringUtils.isNotBlank(model.getAreaPermission())) {
256 255 List<AddressBean> addressBeanList = JsonUtil.toList(model.getAreaPermission(), AddressBean.class);
257   - if (CollectionUtils.isEmpty(addressBeanList))
258   - {
  256 + if (CollectionUtils.isEmpty(addressBeanList)) {
259 257 continue;
260 258 }
261 259  
262 260 Set<String> organizationIds = new HashSet<>();
263 261 if (model.getData() != null) {
264   - for (Object s:model.getData().keySet()) {
  262 + for (Object s : model.getData().keySet()) {
265 263 organizationIds.add(s.toString());
266 264 }
267 265 }
268   - for (AddressBean addressBean:addressBeanList) {
269   - if (addressBean == null)
270   - {
  266 + for (AddressBean addressBean : addressBeanList) {
  267 + if (addressBean == null) {
271 268 continue;
272 269 }
273 270 OrganizationQuery query = new OrganizationQuery();
... ... @@ -277,7 +274,7 @@
277 274 query.setStreetId(addressBean.getS());
278 275 query.setYn(YnEnums.YES.getId());
279 276 List<Organization> organizationList = masterOrganizationMapper.queryOrganization(query);
280   - for (Organization o:organizationList) {
  277 + for (Organization o : organizationList) {
281 278 if (!organizationIds.contains(o.getId().toString())) {
282 279 organizationIds.add(o.getId().toString());
283 280 }
... ... @@ -286,7 +283,7 @@
286 283 model.getData().clear();
287 284 DataPermissionsModel.SimplePermission permission = new DataPermissionsModel.SimplePermission();
288 285 permission.setType(PermissionTypeEnums.ALL_HOSPITAL.getId());
289   - for (String id:organizationIds) {
  286 + for (String id : organizationIds) {
290 287 model.addOnePer(id, permission);
291 288 }
292 289 dataPermissionService.updatePermission(model);
... ... @@ -295,6 +292,15 @@
295 292 } catch (Exception e) {
296 293 e.printStackTrace();
297 294 }
  295 + }
  296 +
  297 + /***
  298 + *
  299 + * 根据医院id查询医院名称
  300 + */
  301 + @Override
  302 + public String getOrganizationName(String id) {
  303 + return masterOrganizationMapper.getOrganizationName(id);
298 304 }
299 305  
300 306 }
platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml View file @ eaeae1a
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
  3 +<mapper namespace="com.lyms.platform.permission.dao.master.MasterCheckItemMapper">
  4 +
  5 + <resultMap id="CheckItemMap" type="com.lyms.platform.permission.model.CheckItem">
  6 + <id column="id" property="id" jdbcType="INTEGER"/>
  7 + <result column="project" property="project" jdbcType="VARCHAR"/>
  8 + <result column="project_info" property="projectInfo" jdbcType="VARCHAR"/>
  9 + </resultMap>
  10 + <select id="getCheckItemList" resultMap="CheckItemMap">
  11 + SELECT id,project FROM lyms_week_project
  12 + </select>
  13 +
  14 + <select id="getOne" resultMap="CheckItemMap" parameterType="java.lang.Integer">
  15 + SELECT id,project FROM lyms_week_project WHERE id=#{id,jdbcType=INTEGER}
  16 + </select>
  17 +</mapper>
platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml View file @ eaeae1a
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
  3 +<mapper namespace="com.lyms.platform.permission.dao.master.MasterCheckItemManageMapper">
  4 +
  5 + <resultMap id="CheckItemManageMap" type="com.lyms.platform.permission.model.CheckItemManage">
  6 + <id column="id" property="id" jdbcType="INTEGER"/>
  7 + <result column="startweek" property="startWeek" jdbcType="INTEGER"/>
  8 + <result column="endweek" property="endWeek" jdbcType="INTEGER"/>
  9 + <result column="checkItemInfoId" property="checkItemInfoId" jdbcType="VARCHAR"/>
  10 + <result column="affiliate" property="affiliateId" jdbcType="VARCHAR"/>
  11 + </resultMap>
  12 + <select id="getCheckItemManageList" resultMap="CheckItemManageMap">
  13 + SELECT id,startweek,endweek,checkItemInfoId,affiliate from lyms_checkitem
  14 + </select>
  15 +
  16 + <insert id="addCheckItem" parameterType="com.lyms.platform.permission.model.CheckItemManage">
  17 + <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer">
  18 + SELECT LAST_INSERT_ID()
  19 + </selectKey>
  20 + INSERT INTO lyms_checkitem(startweek,endweek,checkItemInfoId,affiliate)
  21 + VALUES(#{startWeek},#{endWeek},#{checkItemInfoId},#{affiliateId})
  22 + </insert>
  23 +
  24 +
  25 + <select id="getCheckItemManage" resultMap="CheckItemManageMap">
  26 + SELECT id,startweek,endweek,checkItemInfoId,affiliate from lyms_checkitem where
  27 + affiliate=#{affiliateId}
  28 + </select>
  29 +
  30 + <delete id="deleteCheckItemManage" parameterType="java.lang.Integer">
  31 + delete from lyms_checkitem where id = #{id,jdbcType=INTEGER}
  32 + </delete>
  33 +
  34 + <update id="updateCheckItemManage" parameterType="com.lyms.platform.permission.model.CheckItemManage">
  35 + update lyms_checkitem
  36 + <set>
  37 + <if test="startWeek!=null and startWeek>=0">
  38 + startweek=#{startWeek,jdbcType=INTEGER},
  39 + </if>
  40 + <if test="endWeek!=null and endWeek>=0">
  41 + endweek=#{endWeek,jdbcType=INTEGER},
  42 + </if>
  43 + <if test="checkItemInfoId!=null and checkItemInfoId!=''">
  44 + checkItemInfoId=#{checkItemInfoId,jdbcType=VARCHAR},
  45 + </if>
  46 + <if test="affiliateId!=null and affiliateId!=''">
  47 + affiliate=#{affiliateId,jdbcType=VARCHAR},
  48 + </if>
  49 + </set>
  50 + where id = #{id,jdbcType=INTEGER}
  51 + </update>
  52 +</mapper>
platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml View file @ eaeae1a
... ... @@ -225,7 +225,6 @@
225 225 </select>
226 226  
227 227  
228   -
229 228 <select id="queryHospitalIds" resultMap="OrganizationResultMap"
230 229 parameterType="com.lyms.platform.permission.model.OrganizationQuery">
231 230 select
232 231  
... ... @@ -260,10 +259,15 @@
260 259 <select id="execSql" parameterType="String">
261 260 ${value}
262 261 </select>
263   -
  262 +
264 263 <select id="getOrganizationByAreaId" parameterType="string" resultType="map">
265 264 SELECT id, name FROM `organization` where yn = 1 and area_id = #{areaId}
266 265 </select>
  266 +
  267 + <select id="getOrganizationName" parameterType="java.lang.String" resultType="java.lang.String">
  268 + SELECT name FROM organization WHERE id=#{id,jdbcType=VARCHAR}
  269 + </select>
  270 +
267 271  
268 272 </mapper>
platform-biz-service/src/main/resources/mainOrm/slave/Roles.xml View file @ eaeae1a
... ... @@ -18,16 +18,19 @@
18 18 </resultMap>
19 19  
20 20 <insert id="addRoles" parameterType="com.lyms.platform.permission.model.Roles">
21   - <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer"> SELECT LAST_INSERT_ID() </selectKey>
22   -insert into roles (type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,orgid
  21 + <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer">
  22 + SELECT LAST_INSERT_ID()
  23 + </selectKey>
  24 + insert into roles (type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,orgid
23 25 <if test="id != null and id >= 0">
24 26 ,id
25   - </if>) values (#{type},#{name},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{shortCode},#{orgId}
  27 + </if>) values
  28 + (#{type},#{name},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{shortCode},#{orgId}
26 29 <if test="id != null and id >= 0">
27 30 ,#{id}
28 31 </if>
29 32 )
30   -</insert>
  33 + </insert>
31 34  
32 35  
33 36 <update id="updateRoles" parameterType="com.lyms.platform.permission.model.Roles">
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ eaeae1a
... ... @@ -10,7 +10,7 @@
10 10  
11 11 /**
12 12 * 产前检查初诊模型
13   - *
  13 + * <p>
14 14 * Created by Administrator on 2016/6/21 0021.
15 15 */
16 16 @Document(collection = "lyms_antexc")
17 17  
18 18  
19 19  
... ... @@ -27,17 +27,25 @@
27 27 //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
28 28 private String lisCheckItems;
29 29  
30   - /** 是否打印过 1=已打印 有这个字段就算打印 */
  30 + /**
  31 + * 是否打印过 1=已打印 有这个字段就算打印
  32 + */
31 33 private Integer isPrient;
32 34 // 是否需要发送
33 35 private Boolean isSendMsg;
34 36  
35   - /** 处理意见 */
  37 + /**
  38 + * 处理意见
  39 + */
36 40 private Map<String, List<String>> treatmentOpinion2;
37 41 private List<String> treatmentOpinion2Types;
38   - /** 胎动 */
  42 + /**
  43 + * 胎动
  44 + */
39 45 private String quicken;
40   - /** 胎动备注 */
  46 + /**
  47 + * 胎动备注
  48 + */
41 49 private String quickenRemark;
42 50 //筛查结果
43 51 private List<String> screenResult;
44 52  
45 53  
46 54  
47 55  
48 56  
... ... @@ -68,19 +76,19 @@
68 76 //丙肝
69 77 private String bg;
70 78 // 既往史
71   - private String pastHistory ;
  79 + private String pastHistory;
72 80 // 家族史
73   - private String familyHistory ;
  81 + private String familyHistory;
74 82 //个人史
75 83 private String personalHistory;
76 84 //疫苗接种史
77   - private String ymjzHistory ;
  85 + private String ymjzHistory;
78 86 //药物过敏史
79   - private String ywgmHistory ;
  87 + private String ywgmHistory;
80 88 //妇科手术史
81   - private String fksxHistory ;
  89 + private String fksxHistory;
82 90 // 叶酸服用
83   - private String ysfyHistory ;
  91 + private String ysfyHistory;
84 92 //孕次
85 93 private Integer pregnancyTimes;
86 94 // 产次
... ... @@ -94,7 +102,7 @@
94 102 //死胎
95 103 private Integer stillbirth;
96 104 //死产
97   - private Integer stillChan ;
  105 + private Integer stillChan;
98 106  
99 107 //初诊其他信息
100 108 private List antExcAddOthers;
101 109  
102 110  
... ... @@ -102,11 +110,11 @@
102 110 private Integer survFetus;
103 111  
104 112 // 身高
105   - private String height;
  113 + private String height;
106 114 //体重
107   - private String weight ;
  115 + private String weight;
108 116 //孕前体重
109   - private String yqWeight ;
  117 + private String yqWeight;
110 118 //体重指数
111 119 private String baricIndex;
112 120 //本次妊娠情况
... ... @@ -205,7 +213,7 @@
205 213 //游离甲状腺素（FT4）
206 214 public String freeThy;
207 215 //促甲状腺激素(TSH)
208   - public Map<String,Object> thyStim;
  216 + public Map<String, Object> thyStim;
209 217 //抗甲状腺球蛋白抗体（TGA）
210 218 public String antGlan;
211 219 //抗甲状腺微粒体抗体(TMA)
... ... @@ -252,7 +260,7 @@
252 260 // 衔接
253 261 private String join;*/
254 262 //高危因素
255   - private String highrisk ;
  263 + private String highrisk;
256 264 //高危评分
257 265 private String highriskSocre;
258 266 // 其他高危
259 267  
260 268  
261 269  
262 270  
263 271  
264 272  
... ... @@ -277,27 +285,27 @@
277 285 private Date nextCheckTime;
278 286 private Integer yn;
279 287 //血红蛋白值
280   - private String xhdb ;
  288 + private String xhdb;
281 289 //白细胞计数值
282   - private String bxbjs ;
  290 + private String bxbjs;
283 291 //血小板
284 292 private String platelet;
285 293 // 血常规其他
286   - private String chgOther ;
  294 + private String chgOther;
287 295 // 尿蛋白
288 296 private String ndb;
289 297 //尿糖
290 298 private String nt;
291 299 //尿同体
292   - private String urineKetone ;
  300 + private String urineKetone;
293 301 // 尿潜血
294   - private String bld ;
  302 + private String bld;
295 303 //尿常规其他
296 304 private String ncgOther;
297 305 //ABO
298   - private String abo ;
  306 + private String abo;
299 307 // rh
300   - private String rh ;
  308 + private String rh;
301 309 // 血糖1
302 310 private String bloodSugar;
303 311 // 血糖2
304 312  
305 313  
306 314  
307 315  
308 316  
309 317  
310 318  
... ... @@ -307,21 +315,21 @@
307 315 // 血糖4
308 316 private String bloodSugar4;
309 317 //B超
310   - private String bChao ;
  318 + private String bChao;
311 319 //胎数
312   - private String tireNumber ;
  320 + private String tireNumber;
313 321 //血清谷丙转氨酶
314   - private String xqgbzam ;
  322 + private String xqgbzam;
315 323 //血清谷草转氨酶
316   - private String xqgczam ;
  324 + private String xqgczam;
317 325 //白蛋白
318   - private String albumin ;
  326 + private String albumin;
319 327 //总胆红素
320   - private String totalBilirubin;
  328 + private String totalBilirubin;
321 329 // 结合胆红素
322   - private String jhBilirubin ;
  330 + private String jhBilirubin;
323 331 //乙肝表面抗原
324   - private String ygbmky;
  332 + private String ygbmky;
325 333 //乙肝表面抗体
326 334 private String ygbmkt;
327 335 //乙肝e抗原
328 336  
329 337  
330 338  
331 339  
332 340  
333 341  
... ... @@ -329,23 +337,35 @@
329 337 //乙肝e抗体
330 338 private String ygekt;
331 339 // 乙肝核心抗体
332   - private String yghxkt;
  340 + private String yghxkt;
333 341 // 血清肌
334   - private String xqjq;
  342 + private String xqjq;
335 343 // 血尿素氮
336   - private String xnsd;
  344 + private String xnsd;
337 345 // 梅毒血清实验
338 346 // private String mdxqsy;
339 347 // hit抗体检测
340   - private String hivkt;
  348 + private String hivkt;
341 349 // 阴道分泌物
342   - private String ydfmw;
  350 + private String ydfmw;
343 351 // 阴道清洁度
344   - private String ydqjd;
  352 + private String ydqjd;
345 353  
346 354 private Date modified;
347 355 //操作人
348 356 private Integer operator;
  357 + /**
  358 + * Mode 产检项
  359 + */
  360 + private String configItemId;
  361 +
  362 + public String getConfigItemId() {
  363 + return configItemId;
  364 + }
  365 +
  366 + public void setConfigItemId(String configItemId) {
  367 + this.configItemId = configItemId;
  368 + }
349 369  
350 370 public Boolean getSendMsg() {
351 371 return isSendMsg;
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ eaeae1a
... ... @@ -215,7 +215,9 @@
215 215 public List<String> mHighRiskReason;
216 216  
217 217  
218   - /**承德区域功能*****/
  218 + /**
  219 + * 承德区域功能
  220 + *****/
219 221  
220 222  
221 223 //血红蛋白值
222 224  
... ... @@ -280,7 +282,19 @@
280 282 //是否补录 1 为补录 空为不是补录
281 283 private String supplement;
282 284  
  285 + /**
  286 + * 产检项
  287 + */
  288 + private String configItemId;
283 289  
  290 + public String getConfigItemId() {
  291 + return configItemId;
  292 + }
  293 +
  294 + public void setConfigItemId(String configItemId) {
  295 + this.configItemId = configItemId;
  296 + }
  297 +
284 298 public String getSupplement() {
285 299 return supplement;
286 300 }
287 301  
... ... @@ -481,11 +495,11 @@
481 495 this.hivkt = hivkt;
482 496 }
483 497  
484   - /**承德区域功能*****/
  498 + /**
  499 + * 承德区域功能
  500 + *****/
485 501  
486 502  
487   -
488   -
489 503 public Boolean getSendMsg() {
490 504 return isSendMsg;
491 505 }
... ... @@ -493,6 +507,7 @@
493 507 public void setSendMsg(Boolean sendMsg) {
494 508 isSendMsg = sendMsg;
495 509 }
  510 +
496 511 public String getLisCheckItems() {
497 512 return lisCheckItems;
498 513 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java View file @ eaeae1a
  1 +package com.lyms.platform.operate.web.controller;
  2 +
  3 +import com.lyms.platform.common.base.BaseController;
  4 +import com.lyms.platform.operate.web.result.FrontEndResult;
  5 +import com.lyms.platform.permission.model.CheckItem;
  6 +import com.lyms.platform.permission.service.CheckItemService;
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.stereotype.Controller;
  9 +import org.springframework.web.bind.annotation.RequestMapping;
  10 +import org.springframework.web.bind.annotation.RequestMethod;
  11 +import org.springframework.web.bind.annotation.ResponseBody;
  12 +
  13 +import java.util.List;
  14 +
  15 +
  16 +/**
  17 + * key
  18 + * 小程序检查项
  19 + */
  20 +@Controller
  21 +@RequestMapping("/checkitem")
  22 +public class CheckItemController extends BaseController {
  23 + @Autowired
  24 + private CheckItemService checkItemService;
  25 +
  26 + @RequestMapping(value = "/getCheckItemList", method = RequestMethod.GET)
  27 + @ResponseBody
  28 + public FrontEndResult getCheckItemList() {
  29 + List<CheckItem> checkItem = checkItemService.getCheckItemList();
  30 + return new FrontEndResult().setData(checkItem);
  31 + }
  32 +
  33 +
  34 +
  35 +/*@RequestMapping(value = "/getOne", method = RequestMethod.GET)
  36 + public void getOne() {
  37 + System.out.println("getOne进来了!!");
  38 + CheckItem checkItem = checkItemService.getOne(1);
  39 + System.out.println(checkItem.getProject());
  40 + System.out.println(checkItem.getProjectInfo());
  41 +
  42 + }*/
  43 +
  44 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java View file @ eaeae1a
  1 +package com.lyms.platform.operate.web.controller;
  2 +
  3 +import com.lyms.platform.common.annotation.TokenRequired;
  4 +import com.lyms.platform.common.base.BaseController;
  5 +import com.lyms.platform.common.constants.ErrorCodeConstants;
  6 +import com.lyms.platform.common.result.BaseObjectResponse;
  7 +import com.lyms.platform.common.result.BaseResponse;
  8 +import com.lyms.platform.common.utils.ResultUtils;
  9 +import com.lyms.platform.common.utils.StringUtils;
  10 +import com.lyms.platform.operate.web.result.FrontEndResult;
  11 +import com.lyms.platform.permission.model.CheckItemManage;
  12 +import com.lyms.platform.permission.service.CheckItemManageService;
  13 +import com.lyms.platform.permission.service.CheckItemService;
  14 +import com.lyms.platform.permission.service.OrganizationService;
  15 +import org.springframework.beans.factory.annotation.Autowired;
  16 +import org.springframework.stereotype.Controller;
  17 +import org.springframework.web.bind.annotation.RequestMapping;
  18 +import org.springframework.web.bind.annotation.RequestMethod;
  19 +import org.springframework.web.bind.annotation.RequestParam;
  20 +import org.springframework.web.bind.annotation.ResponseBody;
  21 +
  22 +import javax.servlet.http.HttpServletResponse;
  23 +import java.util.ArrayList;
  24 +import java.util.List;
  25 +
  26 +@Controller
  27 +@RequestMapping("/checkItemManage")
  28 +public class CheckItemManageController extends BaseController {
  29 + @Autowired
  30 + private CheckItemManageService checkItemManageService;
  31 +
  32 + @Autowired
  33 + private CheckItemService checkItemService;
  34 +
  35 + @Autowired
  36 + private OrganizationService organizationService;
  37 +
  38 + /**
  39 + * 查询展示项
  40 + */
  41 + @RequestMapping(value = "/getCheckItemManageList", method = RequestMethod.POST)
  42 + @ResponseBody
  43 + public BaseResponse getCheckItemManageList(@RequestParam(value = "affiliateId") String affiliateId) {
  44 + FrontEndResult frontEndResult = new FrontEndResult();
  45 + if (StringUtils.isNotEmpty(affiliateId)) {
  46 +
  47 + List<CheckItemManage> checkItemManagesList = checkItemManageService.getCheckItemManage(affiliateId);
  48 + for (CheckItemManage checkItemManage : checkItemManagesList) {
  49 + List list = new ArrayList();
  50 + String ItemInfoId = checkItemManage.getCheckItemInfoId();
  51 + String[] str = ItemInfoId.split(",");
  52 + String string = organizationService.getOrganizationName(checkItemManage.getAffiliateId());
  53 + checkItemManage.setAffiliateId(string);
  54 + for (String s : str) {
  55 + List list1 = checkItemService.getOne(Integer.valueOf(s).intValue());
  56 + list.add(list1);
  57 + }
  58 + checkItemManage.setCheckItemInfoName(list);
  59 + }
  60 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(checkItemManagesList);
  61 + } else {
  62 +
  63 + List<CheckItemManage> checkItemManageList = checkItemManageService.getCheckItemManageList();
  64 + for (CheckItemManage checkItemManage : checkItemManageList) {
  65 + String ItemInfoId = checkItemManage.getCheckItemInfoId();
  66 + String[] str = ItemInfoId.split(",");
  67 + List list = new ArrayList();
  68 + for (String s : str) {
  69 + List list1 = checkItemService.getOne(Integer.valueOf(s).intValue());
  70 + list.add(list1);
  71 + checkItemManage.setCheckItemInfoName(list);
  72 + }
  73 + }
  74 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(checkItemManageList);
  75 + }
  76 +
  77 + }
  78 +
  79 +
  80 + /**
  81 + * 添加展示项信息
  82 + */
  83 + @RequestMapping(value = "/addCheckItem", method = RequestMethod.POST)
  84 + @TokenRequired
  85 + public void addCheckItem(HttpServletResponse response,
  86 + @RequestParam(value = "startweek") Integer startweek,
  87 + @RequestParam(value = "endweek") Integer endweek,
  88 + @RequestParam(value = "checkItemInfoId") String checkItemInfoId,
  89 + @RequestParam(value = "affiliateId") String affiliateId) {
  90 + if (null == startweek || null == endweek || StringUtils.isEmpty(checkItemInfoId) || StringUtils.isEmpty(affiliateId)) {
  91 + ResultUtils.buildParameterErrorResultAndWrite(response, "请填写必须项!");
  92 + return;
  93 + } else {
  94 + CheckItemManage checkItemManage = new CheckItemManage();
  95 + checkItemManage.setStartWeek(startweek);
  96 + checkItemManage.setEndWeek(endweek);
  97 + checkItemManage.setCheckItemInfoId(checkItemInfoId);
  98 + checkItemManage.setAffiliateId(affiliateId);
  99 + checkItemManageService.addCheckItem(checkItemManage);
  100 + ResultUtils.buildSuccessResultAndWrite(response);
  101 + }
  102 +
  103 + }
  104 +
  105 + /**
  106 + * 修改展示项
  107 + */
  108 + @RequestMapping(value = "/updateCheckItem", method = RequestMethod.PUT)
  109 + @TokenRequired
  110 + public void updateCheckItem(HttpServletResponse response,
  111 + @RequestParam(value = "id") Integer id,
  112 + @RequestParam(value = "startweek") Integer startweek,
  113 + @RequestParam(value = "endweek") Integer endweek,
  114 + @RequestParam(value = "checkItemInfoId") String checkItemInfoId,
  115 + @RequestParam(value = "affiliateId") String affiliateId) {
  116 + if (null == id) {
  117 + ResultUtils.buildParameterErrorResultAndWrite(response, "请选择要修改的数据");
  118 + return;
  119 + }
  120 + CheckItemManage checkItemManage = new CheckItemManage();
  121 + checkItemManage.setId(id);
  122 + checkItemManage.setStartWeek(startweek);
  123 + checkItemManage.setEndWeek(endweek);
  124 + checkItemManage.setCheckItemInfoId(checkItemInfoId);
  125 + checkItemManage.setAffiliateId(affiliateId);
  126 + Integer count = checkItemManageService.updateCheckItemMagage(checkItemManage);
  127 + if (count > 0 && null != count) {
  128 + ResultUtils.buildResultAndWrite(response, 0, "修改成功");
  129 + } else {
  130 + ResultUtils.buildParameterErrorResultAndWrite(response, "修改失败");
  131 + return;
  132 + }
  133 +
  134 + }
  135 +
  136 + /**
  137 + * 删除展示项
  138 + */
  139 + @RequestMapping(value = "/deleteCheckItem", method = RequestMethod.DELETE)
  140 + @TokenRequired
  141 + public void deleteCheckItem(HttpServletResponse response, @RequestParam("id") Integer id) {
  142 + if (null == id) {
  143 + ResultUtils.buildParameterErrorResultAndWrite(response, "请选择需要删除的数据");
  144 + return;
  145 + }
  146 + Integer count = checkItemManageService.deleteCheckItemManage(id);
  147 + if (count == 0 || count == null) {
  148 + ResultUtils.buildParameterErrorResultAndWrite(response, "删除数据失败!!");
  149 + return;
  150 + } else {
  151 + ResultUtils.buildSuccessResultAndWrite(response, "删除成功!");
  152 + return;
  153 + }
  154 + }
  155 +
  156 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java View file @ eaeae1a
... ... @@ -24,21 +24,23 @@
24 24 * Created by Administrator on 2017-04-24.
25 25 */
26 26 @Intercepts({
27   - @Signature(type = Executor.class, method = "update", args = { MappedStatement.class,Object.class }),
28   - @Signature(type= ResultSetHandler.class, method = "handleResultSets", args = {Statement.class})
29   - })
  27 + @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class}),
  28 + @Signature(type = ResultSetHandler.class, method = "handleResultSets", args = {Statement.class})
  29 +})
30 30 public class MybatisSqlInterceptor implements Interceptor {
31 31  
32 32 //同步的表
33 33 private static Set<String> uses = new HashSet<>();
34 34 //不同步的表
35 35 private static Set<String> noUses = new HashSet<>();
  36 +
36 37 static {
37 38 uses.add("departments");
38 39 uses.add("organization");
39 40 uses.add("roles");
40 41 uses.add("users");
41 42  
  43 +
42 44 noUses.add("baby_patient_extend_ear");
43 45 noUses.add("baby_patient_extend_ear_birth");
44 46 noUses.add("baby_patient_extend_ear_family");
45 47  
46 48  
47 49  
... ... @@ -69,23 +71,22 @@
69 71 noUses.add("role_permission_maps");
70 72 noUses.add("user_organization_maps");
71 73 noUses.add("user_role_maps");
  74 + noUses.add("lyms_week_project");
72 75 }
73 76  
74 77 private String sql;
75 78  
76 79 private Properties properties;
77 80  
78   - private String sqlCommandType;
  81 + private String sqlCommandType;
79 82  
80   - private String sqlId;
  83 + private String sqlId;
81 84  
82 85 public Object intercept(Invocation invocation) throws Throwable {
83 86 Object[] args = invocation.getArgs();
84   - Object returnValue = null;
85   - try
86   - {
87   - if (args != null && args.length == 2)
88   - {
  87 + Object returnValue = null;
  88 + try {
  89 + if (args != null && args.length == 2) {
89 90 MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
90 91 Object parameter = null;
91 92 if (invocation.getArgs().length > 1) {
92 93  
93 94  
... ... @@ -95,29 +96,22 @@
95 96 BoundSql boundSql = mappedStatement.getBoundSql(parameter);
96 97 Configuration configuration = mappedStatement.getConfiguration();
97 98 sqlCommandType = mappedStatement.getSqlCommandType().name();
98   - if ("insert".equals(sqlCommandType.toLowerCase()) )
99   - {
  99 + if ("insert".equals(sqlCommandType.toLowerCase())) {
100 100 String tempSql = getSql(configuration, boundSql, sqlId);
101   - if (isSyncTable(tempSql))
102   - {
  101 + if (isSyncTable(tempSql)) {
103 102 sql = tempSql;
104 103 }
105 104 }
106   - returnValue = invocation.proceed();
107   - }
108   - else
109   - {
110   - returnValue = invocation.proceed();
111   - if (StringUtils.isNotEmpty(sql) && sqlCommandType != null && "insert".equals(sqlCommandType.toLowerCase()))
112   - {
113   - if (returnValue != null && returnValue instanceof ArrayList)
114   - {
115   - List<Integer> list = (ArrayList)returnValue;
116   - if (CollectionUtils.isNotEmpty(list))
117   - {
118   - sql = sql.replaceFirst("\\(","(ID,");
119   - sql = sql.substring(0,sql.lastIndexOf("(")+1)+list.get(0)+","+sql.substring(sql.lastIndexOf("(")+1,sql.length());
120   - System.out.println("add sync sql = "+sql);
  105 + returnValue = invocation.proceed();
  106 + } else {
  107 + returnValue = invocation.proceed();
  108 + if (StringUtils.isNotEmpty(sql) && sqlCommandType != null && "insert".equals(sqlCommandType.toLowerCase())) {
  109 + if (returnValue != null && returnValue instanceof ArrayList) {
  110 + List<Integer> list = (ArrayList) returnValue;
  111 + if (CollectionUtils.isNotEmpty(list)) {
  112 + sql = sql.replaceFirst("\\(", "(ID,");
  113 + sql = sql.substring(0, sql.lastIndexOf("(") + 1) + list.get(0) + "," + sql.substring(sql.lastIndexOf("(") + 1, sql.length());
  114 + System.out.println("add sync sql = " + sql);
121 115 //发送要同步的sql
122 116 SendMysqlSyncDatUtil.addSqlToQueue(sql, sqlId);
123 117 sql = null;
... ... @@ -125,9 +119,8 @@
125 119 }
126 120 }
127 121 }
128   - }catch (Exception e)
129   - {
130   - ExceptionUtils.catchException(e," Mybatis Sql Interceptor exception");
  122 + } catch (Exception e) {
  123 + ExceptionUtils.catchException(e, " Mybatis Sql Interceptor exception");
131 124 }
132 125 return returnValue;
133 126 }
134 127  
135 128  
136 129  
137 130  
... ... @@ -135,31 +128,26 @@
135 128  
136 129 /**
137 130 * 判断sql中的表是否要同步的
  131 + *
138 132 * @param sql
139 133 * @return
140 134 */
141   - private boolean isSyncTable(String sql)
142   - {
  135 + private boolean isSyncTable(String sql) {
143 136 boolean use = false;
144 137 boolean nouse = true;
145   - if (StringUtils.isEmpty(sql))
146   - {
  138 + if (StringUtils.isEmpty(sql)) {
147 139 return use;
148 140 }
149   - for(String key : uses)
150   - {
151   - if (sql.toLowerCase().contains(key))
152   - {
153   - use = true;
  141 + for (String key : uses) {
  142 + if (sql.toLowerCase().contains(key)) {
  143 + use = true;
154 144 break;
155 145 }
156 146 }
157 147  
158   - for(String key : noUses)
159   - {
160   - if (sql.toLowerCase().contains(key))
161   - {
162   - nouse = false;
  148 + for (String key : noUses) {
  149 + if (sql.toLowerCase().contains(key)) {
  150 + nouse = false;
163 151 break;
164 152 }
165 153 }
... ... @@ -172,7 +160,7 @@
172 160 return sql;
173 161 }
174 162  
175   - private static String getParameterValue(Object obj,String javaType) {
  163 + private static String getParameterValue(Object obj, String javaType) {
176 164 String value = null;
177 165 if (obj instanceof String) {
178 166 value = "'" + obj.toString() + "'";
... ... @@ -182,8 +170,7 @@
182 170 } else {
183 171 if (obj != null) {
184 172 value = obj.toString();
185   - } else
186   - {
  173 + } else {
187 174 value = "null";
188 175 }
189 176 }
... ... @@ -197,7 +184,7 @@
197 184 if (parameterMappings.size() > 0 && parameterObject != null) {
198 185 TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry();
199 186 if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
200   - sql = sql.replaceFirst("\\?", getParameterValue(parameterObject,parameterObject.getClass().getName()));
  187 + sql = sql.replaceFirst("\\?", getParameterValue(parameterObject, parameterObject.getClass().getName()));
201 188  
202 189 } else {
203 190 MetaObject metaObject = configuration.newMetaObject(parameterObject);
204 191  
... ... @@ -205,10 +192,10 @@
205 192 String propertyName = parameterMapping.getProperty();
206 193 if (metaObject.hasGetter(propertyName)) {
207 194 Object obj = metaObject.getValue(propertyName);
208   - sql = sql.replaceFirst("\\?", getParameterValue(obj,parameterMapping.getJavaType().getName()));
  195 + sql = sql.replaceFirst("\\?", getParameterValue(obj, parameterMapping.getJavaType().getName()));
209 196 } else if (boundSql.hasAdditionalParameter(propertyName)) {
210 197 Object obj = boundSql.getAdditionalParameter(propertyName);
211   - sql = sql.replaceFirst("\\?", getParameterValue(obj,parameterMapping.getJavaType().getName()));
  198 + sql = sql.replaceFirst("\\?", getParameterValue(obj, parameterMapping.getJavaType().getName()));
212 199 }
213 200 }
214 201 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ eaeae1a
... ... @@ -26,11 +26,15 @@
26 26 //诸城妇幼复诊特有字段 随机血糖单位mmol/L
27 27 private String randomBloodSugar;
28 28  
29   - /** 处理意见 */
  29 + /**
  30 + * 处理意见
  31 + */
30 32 private Map<String, List<String>> treatmentOpinion2;
31 33 private List<String> treatmentOpinion2Types;
32 34  
33   - /** 胎动情况 */
  35 + /**
  36 + * 胎动情况
  37 + */
34 38 private String quicken;
35 39 private String quickenRemark;
36 40 private String vcCardNo;
... ... @@ -150,7 +154,7 @@
150 154 //游离甲状腺素（FT4）
151 155 public String freeThy;
152 156 //促甲状腺激素(TSH)
153   - public Map<String,Object> thyStim;
  157 + public Map<String, Object> thyStim;
154 158 //抗甲状腺球蛋白抗体（TGA）
155 159 public String antGlan;
156 160 //抗甲状腺微粒体抗体(TMA)
... ... @@ -191,7 +195,9 @@
191 195 public String electr;
192 196  
193 197  
194   - /**承德区域功能*****/
  198 + /**
  199 + * 承德区域功能
  200 + *****/
195 201  
196 202  
197 203 //血红蛋白值
198 204  
... ... @@ -253,7 +259,19 @@
253 259 private String hivkt;
254 260  
255 261 private String supplement;
  262 + /**
  263 + * 产检项
  264 + */
  265 + private String configItemId;
256 266  
  267 + public String getConfigItemId() {
  268 + return configItemId;
  269 + }
  270 +
  271 + public void setConfigItemId(String configItemId) {
  272 + this.configItemId = configItemId;
  273 + }
  274 +
257 275 public String getSupplement() {
258 276 return supplement;
259 277 }
... ... @@ -270,7 +288,9 @@
270 288 this.vcCardNo = vcCardNo;
271 289 }
272 290  
273   - /**承德区域功能*****/
  291 + /**
  292 + * 承德区域功能
  293 + *****/
274 294  
275 295 public String getBxbjs() {
276 296 return bxbjs;
... ... @@ -498,6 +518,7 @@
498 518 public void setmHighRiskReason(List<String> mHighRiskReason) {
499 519 this.mHighRiskReason = mHighRiskReason;
500 520 }
  521 +
501 522 public String getQuickenRemark() {
502 523 return quickenRemark;
503 524 }
... ... @@ -894,7 +915,7 @@
894 915  
895 916 @Override
896 917 public AntenatalExaminationModel convertToDataModel() {
897   - AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
  918 + AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
898 919 examinationModel.setSendMsg(isSendMsg);
899 920 examinationModel.setScreenResult(screenResult);
900 921 examinationModel.setResultSupple(resultSupple);
901 922  
902 923  
... ... @@ -960,12 +981,12 @@
960 981 examinationModel.setBloodSugar4(bloodSugar4);
961 982 examinationModel.setRiskFactor(JsonUtil.array2JsonString(riskFactor));
962 983 examinationModel.setRiskScore(riskScore);
963   - if(CollectionUtils.isNotEmpty(otherRisk)){
  984 + if (CollectionUtils.isNotEmpty(otherRisk)) {
964 985 examinationModel.setOtherRisk(JsonUtil.array2JsonString(otherRisk));
965   - }else{
  986 + } else {
966 987 examinationModel.setOtherRisk("{}");
967 988 }
968   - if(null!=diagnosis){
  989 + if (null != diagnosis) {
969 990 examinationModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis));
970 991 }
971 992 examinationModel.setType(type);
972 993  
... ... @@ -973,10 +994,10 @@
973 994 examinationModel.setTreatmentOpinion(treatmentOpinion);
974 995 examinationModel.setGuide(guide);
975 996 examinationModel.setCheckDoctor(checkDoctor);
976   - if(null!=checkDate){
  997 + if (null != checkDate) {
977 998 examinationModel.setCheckDate(DateUtil.parseYMD(checkDate));
978 999 }
979   - if(null!=nextCheckTime){
  1000 + if (null != nextCheckTime) {
980 1001  
981 1002 examinationModel.setNextCheckTime(DateUtil.parseYMD(nextCheckTime));
982 1003 }
... ... @@ -1008,6 +1029,7 @@
1008 1029 examinationModel.setSyjg(syjg);
1009 1030 examinationModel.setHivkt(hivkt);
1010 1031 examinationModel.setSupplement(supplement);
  1032 + examinationModel.setConfigItemId(configItemId);
1011 1033  
1012 1034 return examinationModel;
1013 1035 }
... ... @@ -1208,7 +1230,8 @@
1208 1230 public void setWeight(Double weight) {
1209 1231 this.weight = weight;
1210 1232 }
1211   - public static void main(String[] args){
  1233 +
  1234 + public static void main(String[] args) {
1212 1235 System.out.print(JsonUtil.obj2JsonString(new AntExAddRequest()));
1213 1236 }
1214 1237 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ eaeae1a
... ... @@ -347,6 +347,19 @@
347 347 //浮肿
348 348 private String edema;
349 349  
  350 + /**
  351 + * 产检项
  352 + */
  353 + private String configItemId;
  354 +
  355 + public String getConfigItemId() {
  356 + return configItemId;
  357 + }
  358 +
  359 + public void setConfigItemId(String configItemId) {
  360 + this.configItemId = configItemId;
  361 + }
  362 +
350 363 public String getVcCardNo() {
351 364 return vcCardNo;
352 365 }
... ... @@ -394,6 +407,7 @@
394 407 public void setGynRemark(String gynRemark) {
395 408 this.gynRemark = gynRemark;
396 409 }
  410 +
397 411 public String getYqweight() {
398 412 return yqweight;
399 413 }
... ... @@ -441,6 +455,7 @@
441 455 public void setmHighRiskReason(List<String> mHighRiskReason) {
442 456 this.mHighRiskReason = mHighRiskReason;
443 457 }
  458 +
444 459 public String getCweight() {
445 460 return cweight;
446 461 }
... ... @@ -1792,6 +1807,12 @@
1792 1807 antExChuModel.setFuwei(fuwei);
1793 1808 antExChuModel.setTireNumber1(tireNumber1);
1794 1809 antExChuModel.setPlacentas(placentas);
  1810 + /**
  1811 + * 产检项
  1812 + * */
  1813 + antExChuModel.setConfigItemId(configItemId);
  1814 +
  1815 +
1795 1816 if (null != bp) {
1796 1817 antExChuModel.setBp(JsonUtil.obj2JsonString(bp));
1797 1818 }
platform-operate-api/src/main/resources/spring/applicationContext.xml View file @ eaeae1a
... ... @@ -22,9 +22,9 @@
22 22 <context:component-scan base-package="com.lyms.platform.operate.web.facade"/>
23 23 <context:component-scan base-package="com.lyms.platform.operate.web.service"/>
24 24 <context:component-scan base-package="com.lyms.platform.permission.*"/>
25   - <context:component-scan base-package="com.lymsh.platform.reportdata.model.*" />
26   - <context:component-scan base-package="com.lymsh.platform.reportdata.dao" />
27   - <context:component-scan base-package="com.lymsh.platform.reportdata.service" />
  25 + <context:component-scan base-package="com.lymsh.platform.reportdata.model.*"/>
  26 + <context:component-scan base-package="com.lymsh.platform.reportdata.dao"/>
  27 + <context:component-scan base-package="com.lymsh.platform.reportdata.service"/>
28 28 <!-- 提示信息加载类 -->
29 29 <bean class="com.lyms.platform.common.core.resolve.MessageResolver">
30 30 <property name="messageFile" value="message.properties"/>
... ... @@ -42,7 +42,7 @@
42 42 <task:annotation-driven/>
43 43  
44 44 <!--<task:scheduled-tasks>-->
45   - <!--<task:scheduled ref="syncDataTaskService" method="syncData" cron="0 0/10 * * * ?"/>-->
  45 + <!--<task:scheduled ref="syncDataTaskService" method="syncData" cron="0 0/10 * * * ?"/>-->
46 46 <!--</task:scheduled-tasks>-->
47 47  
48 48 <bean id="sessionProvider" class="com.lyms.platform.operate.web.session.SessionProvider">
49 49  
... ... @@ -63,12 +63,12 @@
63 63 <property name="corePoolSize" value="20"/>
64 64  
65 65 <!-- 最大线程数，默认为Integer.MAX_VALUE -->
66   - <property name="maxPoolSize" value="50" />
  66 + <property name="maxPoolSize" value="50"/>
67 67 <!-- 队列最大长度，一般需要设置值>=notifyScheduledMainExecutor.maxNum；默认为Integer.MAX_VALUE
68 68 <property name="queueCapacity" value="1000" /> -->
69 69  
70 70 <!-- 线程池维护线程所允许的空闲时间，默认为60s -->
71   - <property name="keepAliveSeconds" value="300" />
  71 + <property name="keepAliveSeconds" value="300"/>
72 72  
73 73 <!-- 线程池对拒绝任务（无线程可用）的处理策略，目前只支持AbortPolicy、CallerRunsPolicy；默认为后者
74 74 <bean class="java.util.concurrent.ThreadPoolExecutor$CallerRunsPolicy" />