diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java new file mode 100644 index 0000000..8068b3e --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java @@ -0,0 +1,18 @@ +package com.lyms.platform.permission.dao.master; + +import com.lyms.platform.permission.model.CheckItemManage; + +import java.util.List; + +public interface MasterCheckItemManageMapper { + + public List getCheckItemManageList(); + + public void addCheckItem(CheckItemManage checkItemManage); + + public List getCheckItemManage(String id); + + public Integer deleteCheckItemManage(Integer id); + + public Integer updateCheckItemManage(CheckItemManage checkItemManage); +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java new file mode 100644 index 0000000..3b658b7 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java @@ -0,0 +1,14 @@ +package com.lyms.platform.permission.dao.master; + +import com.lyms.platform.permission.model.CheckItem; + +import java.util.List; + +public interface MasterCheckItemMapper { + + public List getCheckItemList(); + + public List getOne(Integer id); + + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java index 4b4a088..b5120f5 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java @@ -25,7 +25,13 @@ public interface MasterOrganizationMapper { void execSql(String sql); - List> getOrganizationByAreaId(String id); + List> getOrganizationByAreaId(String id); List queryHospitalIds(OrganizationQuery organizationQuery); + + /** + * 根据医院id查询医院名称 + */ + public String getOrganizationName(String id); + } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterRolesMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterRolesMapper.java index 1590de8..de7fd4b 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterRolesMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterRolesMapper.java @@ -5,6 +5,17 @@ import com.lyms.platform.permission.model.RolesQuery; import java.util.List; -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 queryRoles(RolesQuery query); +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 queryRoles(RolesQuery query); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java new file mode 100644 index 0000000..7bf76aa --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java @@ -0,0 +1,32 @@ +package com.lyms.platform.permission.model; + +public class CheckItem { + private Integer id; + private String project; + private String projectInfo; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + + public String getProjectInfo() { + return projectInfo; + } + + public void setProjectInfo(String projectInfo) { + this.projectInfo = projectInfo; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManage.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManage.java new file mode 100644 index 0000000..8aba9b1 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManage.java @@ -0,0 +1,72 @@ +package com.lyms.platform.permission.model; + + +import java.util.List; +import java.util.Map; + +public class CheckItemManage { + private Integer id; + private Integer startWeek; + private Integer endWeek; + private String checkItemInfoId; + private String affiliateId; + private List checkItemInfoName; + + private Map ItemInfoIdMap; + + public Map getItemInfoIdMap() { + return ItemInfoIdMap; + } + + public void setItemInfoIdMap(Map itemInfoIdMap) { + ItemInfoIdMap = itemInfoIdMap; + } + + public List getCheckItemInfoName() { + return checkItemInfoName; + } + + public void setCheckItemInfoName(List checkItemInfoName) { + this.checkItemInfoName = checkItemInfoName; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getStartWeek() { + return startWeek; + } + + public void setStartWeek(Integer startWeek) { + this.startWeek = startWeek; + } + + public Integer getEndWeek() { + return endWeek; + } + + public void setEndWeek(Integer endWeek) { + this.endWeek = endWeek; + } + + public String getCheckItemInfoId() { + return checkItemInfoId; + } + + public void setCheckItemInfoId(String checkItemInfoId) { + this.checkItemInfoId = checkItemInfoId; + } + + public String getAffiliateId() { + return affiliateId; + } + + public void setAffiliateId(String affiliateId) { + this.affiliateId = affiliateId; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java new file mode 100644 index 0000000..0ab73d3 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java @@ -0,0 +1,17 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.CheckItemManage; + +import java.util.List; + +public interface CheckItemManageService { + public List getCheckItemManageList(); + + public void addCheckItem(CheckItemManage checkItemManage); + + public List getCheckItemManage(String id); + + public Integer deleteCheckItemManage(Integer id); + + public Integer updateCheckItemMagage(CheckItemManage checkItemManage); +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java new file mode 100644 index 0000000..cde1790 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java @@ -0,0 +1,15 @@ +package com.lyms.platform.permission.service; + + +import com.lyms.platform.permission.model.CheckItem; + +import java.util.List; + +public interface CheckItemService { + + public List getCheckItemList(); + + public List getOne(Integer id); + + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java index 0979841..d2df741 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java @@ -20,6 +20,7 @@ public interface OrganizationService { public List queryOrganization(OrganizationQuery query); List queryProvinceIdByOrgId(List orgId); + List queryHospital(); List queryHospitals(OrganizationQuery organizationQuery); @@ -35,5 +36,11 @@ public interface OrganizationService { void execSql(String sql); - List> getOrganizationByAreaId(String id); + List> getOrganizationByAreaId(String id); + + + /** + * 根据id查询医院名称 + */ + public String getOrganizationName(String id); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java new file mode 100644 index 0000000..327ce16 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java @@ -0,0 +1,42 @@ +package com.lyms.platform.permission.service.impl; + +import com.lyms.platform.permission.dao.master.MasterCheckItemManageMapper; +import com.lyms.platform.permission.model.CheckItemManage; +import com.lyms.platform.permission.service.CheckItemManageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class CheckItemManageServiceImpl implements CheckItemManageService { + + @Autowired + private MasterCheckItemManageMapper checkItemManageMapper; + + @Override + public List getCheckItemManageList() { + return checkItemManageMapper.getCheckItemManageList(); + } + + @Override + public void addCheckItem(CheckItemManage checkItemManage) { + checkItemManageMapper.addCheckItem(checkItemManage); + } + + @Override + public List getCheckItemManage(String id) { + + return checkItemManageMapper.getCheckItemManage(id); + } + + @Override + public Integer deleteCheckItemManage(Integer id) { + return checkItemManageMapper.deleteCheckItemManage(id); + } + + @Override + public Integer updateCheckItemMagage(CheckItemManage checkItemManage) { + return checkItemManageMapper.updateCheckItemManage(checkItemManage); + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java new file mode 100644 index 0000000..6ea0130 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java @@ -0,0 +1,29 @@ +package com.lyms.platform.permission.service.impl; + +import com.lyms.platform.permission.dao.master.MasterCheckItemMapper; +import com.lyms.platform.permission.model.CheckItem; +import com.lyms.platform.permission.model.CheckItemManage; +import com.lyms.platform.permission.service.CheckItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class CheckItemServiceImpl implements CheckItemService { + + @Autowired + private MasterCheckItemMapper checkItemMapper; + + @Override + public List getCheckItemList() { + return checkItemMapper.getCheckItemList(); + } + + @Override + public List getOne(Integer id) { + return checkItemMapper.getOne(id); + } + + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java index 6838d70..c1d523e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java @@ -96,7 +96,7 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O rolesList.add(rolesService.getRoles(63)); rolesList.add(rolesService.getRoles(48)); rolesList.add(rolesService.getRoles(66)); - for (Roles roles:rolesList) { + for (Roles roles : rolesList) { // RolePermissionMapsQuery mapsQuery = new RolePermissionMapsQuery(); // mapsQuery.setYn(YnEnums.YES.getId()); // mapsQuery.setRoleId(roles.getId()); @@ -173,7 +173,7 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O @Override public List queryOrganization(OrganizationQuery query) { if (query.getNeed() != null) { - query.mysqlBuild( masterOrganizationMapper.queryOrganizationCount(query)); + query.mysqlBuild(masterOrganizationMapper.queryOrganizationCount(query)); } List organizations = masterOrganizationMapper.queryOrganization(query); if (CollectionUtils.isNotEmpty(organizations)) { @@ -213,7 +213,7 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O } List results = new ArrayList<>(); - List organizations = masterOrganizationMapper.queryOrganization(query); + List organizations = masterOrganizationMapper.queryOrganization(query); if (CollectionUtils.isNotEmpty(organizations)) { for (Organization organization : organizations) { @@ -247,27 +247,24 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O DataPermissionsModelQuery visitQuery = new DataPermissionsModelQuery(); visitQuery.setUserId(userId); List list = dataPermissionService.queryPermission(visitQuery); - if (CollectionUtils.isEmpty(list)) - { + if (CollectionUtils.isEmpty(list)) { return; } for (DataPermissionsModel model : list) { if (StringUtils.isNotBlank(model.getAreaPermission())) { List addressBeanList = JsonUtil.toList(model.getAreaPermission(), AddressBean.class); - if (CollectionUtils.isEmpty(addressBeanList)) - { + if (CollectionUtils.isEmpty(addressBeanList)) { continue; } Set organizationIds = new HashSet<>(); if (model.getData() != null) { - for (Object s:model.getData().keySet()) { + for (Object s : model.getData().keySet()) { organizationIds.add(s.toString()); } } - for (AddressBean addressBean:addressBeanList) { - if (addressBean == null) - { + for (AddressBean addressBean : addressBeanList) { + if (addressBean == null) { continue; } OrganizationQuery query = new OrganizationQuery(); @@ -277,7 +274,7 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O query.setStreetId(addressBean.getS()); query.setYn(YnEnums.YES.getId()); List organizationList = masterOrganizationMapper.queryOrganization(query); - for (Organization o:organizationList) { + for (Organization o : organizationList) { if (!organizationIds.contains(o.getId().toString())) { organizationIds.add(o.getId().toString()); } @@ -286,7 +283,7 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O model.getData().clear(); DataPermissionsModel.SimplePermission permission = new DataPermissionsModel.SimplePermission(); permission.setType(PermissionTypeEnums.ALL_HOSPITAL.getId()); - for (String id:organizationIds) { + for (String id : organizationIds) { model.addOnePer(id, permission); } dataPermissionService.updatePermission(model); @@ -297,4 +294,13 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O } } + /*** + * + * 根据医院id查询医院名称 + */ + @Override + public String getOrganizationName(String id) { + return masterOrganizationMapper.getOrganizationName(id); + } + } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml new file mode 100644 index 0000000..f1336f6 --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml new file mode 100644 index 0000000..b4a4cb0 --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + SELECT LAST_INSERT_ID() + + INSERT INTO lyms_checkitem(startweek,endweek,checkItemInfoId,affiliate) + VALUES(#{startWeek},#{endWeek},#{checkItemInfoId},#{affiliateId}) + + + + + + + delete from lyms_checkitem where id = #{id,jdbcType=INTEGER} + + + + update lyms_checkitem + + + startweek=#{startWeek,jdbcType=INTEGER}, + + + endweek=#{endWeek,jdbcType=INTEGER}, + + + checkItemInfoId=#{checkItemInfoId,jdbcType=VARCHAR}, + + + affiliate=#{affiliateId,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml index 31a261b..f78641a 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml @@ -225,7 +225,6 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri - ${value} - + + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/slave/Roles.xml b/platform-biz-service/src/main/resources/mainOrm/slave/Roles.xml index 32edf8b..19c6f84 100644 --- a/platform-biz-service/src/main/resources/mainOrm/slave/Roles.xml +++ b/platform-biz-service/src/main/resources/mainOrm/slave/Roles.xml @@ -18,16 +18,19 @@ - SELECT LAST_INSERT_ID() -insert into roles (type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,orgid + + SELECT LAST_INSERT_ID() + + insert into roles (type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,orgid ,id - ) values (#{type},#{name},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{shortCode},#{orgId} + ) values + (#{type},#{name},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{shortCode},#{orgId} ,#{id} ) - + diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 1b7f736..93b7d67 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -10,7 +10,7 @@ import java.util.Map; /** * 产前检查初诊模型 - * + *

* Created by Administrator on 2016/6/21 0021. */ @Document(collection = "lyms_antexc") @@ -27,17 +27,25 @@ public class AntExChuModel extends BaseModel { //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项 private String lisCheckItems; - /** 是否打印过 1=已打印 有这个字段就算打印 */ + /** + * 是否打印过 1=已打印 有这个字段就算打印 + */ private Integer isPrient; // 是否需要发送 private Boolean isSendMsg; - /** 处理意见 */ + /** + * 处理意见 + */ private Map> treatmentOpinion2; private List treatmentOpinion2Types; - /** 胎动 */ + /** + * 胎动 + */ private String quicken; - /** 胎动备注 */ + /** + * 胎动备注 + */ private String quickenRemark; //筛查结果 private List screenResult; @@ -68,19 +76,19 @@ public class AntExChuModel extends BaseModel { //丙肝 private String bg; // 既往史 - private String pastHistory ; + private String pastHistory; // 家族史 - private String familyHistory ; + private String familyHistory; //个人史 private String personalHistory; //疫苗接种史 - private String ymjzHistory ; + private String ymjzHistory; //药物过敏史 - private String ywgmHistory ; + private String ywgmHistory; //妇科手术史 - private String fksxHistory ; + private String fksxHistory; // 叶酸服用 - private String ysfyHistory ; + private String ysfyHistory; //孕次 private Integer pregnancyTimes; // 产次 @@ -94,7 +102,7 @@ public class AntExChuModel extends BaseModel { //死胎 private Integer stillbirth; //死产 - private Integer stillChan ; + private Integer stillChan; //初诊其他信息 private List antExcAddOthers; @@ -102,11 +110,11 @@ public class AntExChuModel extends BaseModel { private Integer survFetus; // 身高 - private String height; + private String height; //体重 - private String weight ; + private String weight; //孕前体重 - private String yqWeight ; + private String yqWeight; //体重指数 private String baricIndex; //本次妊娠情况 @@ -205,7 +213,7 @@ public class AntExChuModel extends BaseModel { //游离甲状腺素（FT4） public String freeThy; //促甲状腺激素(TSH) - public Map thyStim; + public Map thyStim; //抗甲状腺球蛋白抗体（TGA） public String antGlan; //抗甲状腺微粒体抗体(TMA) @@ -252,7 +260,7 @@ public class AntExChuModel extends BaseModel { // 衔接 private String join;*/ //高危因素 - private String highrisk ; + private String highrisk; //高危评分 private String highriskSocre; // 其他高危 @@ -277,27 +285,27 @@ public class AntExChuModel extends BaseModel { private Date nextCheckTime; private Integer yn; //血红蛋白值 - private String xhdb ; + private String xhdb; //白细胞计数值 - private String bxbjs ; + private String bxbjs; //血小板 private String platelet; // 血常规其他 - private String chgOther ; + private String chgOther; // 尿蛋白 private String ndb; //尿糖 private String nt; //尿同体 - private String urineKetone ; + private String urineKetone; // 尿潜血 - private String bld ; + private String bld; //尿常规其他 private String ncgOther; //ABO - private String abo ; + private String abo; // rh - private String rh ; + private String rh; // 血糖1 private String bloodSugar; // 血糖2 @@ -307,21 +315,21 @@ public class AntExChuModel extends BaseModel { // 血糖4 private String bloodSugar4; //B超 - private String bChao ; + private String bChao; //胎数 - private String tireNumber ; + private String tireNumber; //血清谷丙转氨酶 - private String xqgbzam ; + private String xqgbzam; //血清谷草转氨酶 - private String xqgczam ; + private String xqgczam; //白蛋白 - private String albumin ; + private String albumin; //总胆红素 - private String totalBilirubin; + private String totalBilirubin; // 结合胆红素 - private String jhBilirubin ; + private String jhBilirubin; //乙肝表面抗原 - private String ygbmky; + private String ygbmky; //乙肝表面抗体 private String ygbmkt; //乙肝e抗原 @@ -329,23 +337,35 @@ public class AntExChuModel extends BaseModel { //乙肝e抗体 private String ygekt; // 乙肝核心抗体 - private String yghxkt; + private String yghxkt; // 血清肌 - private String xqjq; + private String xqjq; // 血尿素氮 - private String xnsd; + private String xnsd; // 梅毒血清实验 // private String mdxqsy; // hit抗体检测 - private String hivkt; + private String hivkt; // 阴道分泌物 - private String ydfmw; + private String ydfmw; // 阴道清洁度 - private String ydqjd; + private String ydqjd; private Date modified; //操作人 private Integer operator; + /** + * Mode 产检项 + */ + private String configItemId; + + public String getConfigItemId() { + return configItemId; + } + + public void setConfigItemId(String configItemId) { + this.configItemId = configItemId; + } public Boolean getSendMsg() { return isSendMsg; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index c4f729b..dbab146 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -215,7 +215,9 @@ public class AntenatalExaminationModel extends BaseModel { public List mHighRiskReason; - /**承德区域功能*****/ + /** + * 承德区域功能 + *****/ //血红蛋白值 @@ -280,6 +282,18 @@ public class AntenatalExaminationModel extends BaseModel { //是否补录 1 为补录 空为不是补录 private String supplement; + /** + * 产检项 + */ + private String configItemId; + + public String getConfigItemId() { + return configItemId; + } + + public void setConfigItemId(String configItemId) { + this.configItemId = configItemId; + } public String getSupplement() { return supplement; @@ -481,9 +495,9 @@ public class AntenatalExaminationModel extends BaseModel { this.hivkt = hivkt; } - /**承德区域功能*****/ - - + /** + * 承德区域功能 + *****/ public Boolean getSendMsg() { @@ -493,6 +507,7 @@ public class AntenatalExaminationModel extends BaseModel { public void setSendMsg(Boolean sendMsg) { isSendMsg = sendMsg; } + public String getLisCheckItems() { return lisCheckItems; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java new file mode 100644 index 0000000..5915cbc --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java @@ -0,0 +1,44 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.operate.web.result.FrontEndResult; +import com.lyms.platform.permission.model.CheckItem; +import com.lyms.platform.permission.service.CheckItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + + +/** + * key + * 小程序检查项 + */ +@Controller +@RequestMapping("/checkitem") +public class CheckItemController extends BaseController { + @Autowired + private CheckItemService checkItemService; + + @RequestMapping(value = "/getCheckItemList", method = RequestMethod.GET) + @ResponseBody + public FrontEndResult getCheckItemList() { + List checkItem = checkItemService.getCheckItemList(); + return new FrontEndResult().setData(checkItem); + } + + + +/*@RequestMapping(value = "/getOne", method = RequestMethod.GET) + public void getOne() { + System.out.println("getOne进来了!!"); + CheckItem checkItem = checkItemService.getOne(1); + System.out.println(checkItem.getProject()); + System.out.println(checkItem.getProjectInfo()); + + }*/ + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java new file mode 100644 index 0000000..a5cdb17 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java @@ -0,0 +1,156 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.result.FrontEndResult; +import com.lyms.platform.permission.model.CheckItemManage; +import com.lyms.platform.permission.service.CheckItemManageService; +import com.lyms.platform.permission.service.CheckItemService; +import com.lyms.platform.permission.service.OrganizationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; + +@Controller +@RequestMapping("/checkItemManage") +public class CheckItemManageController extends BaseController { + @Autowired + private CheckItemManageService checkItemManageService; + + @Autowired + private CheckItemService checkItemService; + + @Autowired + private OrganizationService organizationService; + + /** + * 查询展示项 + */ + @RequestMapping(value = "/getCheckItemManageList", method = RequestMethod.POST) + @ResponseBody + public BaseResponse getCheckItemManageList(@RequestParam(value = "affiliateId") String affiliateId) { + FrontEndResult frontEndResult = new FrontEndResult(); + if (StringUtils.isNotEmpty(affiliateId)) { + + List checkItemManagesList = checkItemManageService.getCheckItemManage(affiliateId); + for (CheckItemManage checkItemManage : checkItemManagesList) { + List list = new ArrayList(); + String ItemInfoId = checkItemManage.getCheckItemInfoId(); + String[] str = ItemInfoId.split(","); + String string = organizationService.getOrganizationName(checkItemManage.getAffiliateId()); + checkItemManage.setAffiliateId(string); + for (String s : str) { + List list1 = checkItemService.getOne(Integer.valueOf(s).intValue()); + list.add(list1); + } + checkItemManage.setCheckItemInfoName(list); + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(checkItemManagesList); + } else { + + List checkItemManageList = checkItemManageService.getCheckItemManageList(); + for (CheckItemManage checkItemManage : checkItemManageList) { + String ItemInfoId = checkItemManage.getCheckItemInfoId(); + String[] str = ItemInfoId.split(","); + List list = new ArrayList(); + for (String s : str) { + List list1 = checkItemService.getOne(Integer.valueOf(s).intValue()); + list.add(list1); + checkItemManage.setCheckItemInfoName(list); + } + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(checkItemManageList); + } + + } + + + /** + * 添加展示项信息 + */ + @RequestMapping(value = "/addCheckItem", method = RequestMethod.POST) + @TokenRequired + public void addCheckItem(HttpServletResponse response, + @RequestParam(value = "startweek") Integer startweek, + @RequestParam(value = "endweek") Integer endweek, + @RequestParam(value = "checkItemInfoId") String checkItemInfoId, + @RequestParam(value = "affiliateId") String affiliateId) { + if (null == startweek || null == endweek || StringUtils.isEmpty(checkItemInfoId) || StringUtils.isEmpty(affiliateId)) { + ResultUtils.buildParameterErrorResultAndWrite(response, "请填写必须项!"); + return; + } else { + CheckItemManage checkItemManage = new CheckItemManage(); + checkItemManage.setStartWeek(startweek); + checkItemManage.setEndWeek(endweek); + checkItemManage.setCheckItemInfoId(checkItemInfoId); + checkItemManage.setAffiliateId(affiliateId); + checkItemManageService.addCheckItem(checkItemManage); + ResultUtils.buildSuccessResultAndWrite(response); + } + + } + + /** + * 修改展示项 + */ + @RequestMapping(value = "/updateCheckItem", method = RequestMethod.PUT) + @TokenRequired + public void updateCheckItem(HttpServletResponse response, + @RequestParam(value = "id") Integer id, + @RequestParam(value = "startweek") Integer startweek, + @RequestParam(value = "endweek") Integer endweek, + @RequestParam(value = "checkItemInfoId") String checkItemInfoId, + @RequestParam(value = "affiliateId") String affiliateId) { + if (null == id) { + ResultUtils.buildParameterErrorResultAndWrite(response, "请选择要修改的数据"); + return; + } + CheckItemManage checkItemManage = new CheckItemManage(); + checkItemManage.setId(id); + checkItemManage.setStartWeek(startweek); + checkItemManage.setEndWeek(endweek); + checkItemManage.setCheckItemInfoId(checkItemInfoId); + checkItemManage.setAffiliateId(affiliateId); + Integer count = checkItemManageService.updateCheckItemMagage(checkItemManage); + if (count > 0 && null != count) { + ResultUtils.buildResultAndWrite(response, 0, "修改成功"); + } else { + ResultUtils.buildParameterErrorResultAndWrite(response, "修改失败"); + return; + } + + } + + /** + * 删除展示项 + */ + @RequestMapping(value = "/deleteCheckItem", method = RequestMethod.DELETE) + @TokenRequired + public void deleteCheckItem(HttpServletResponse response, @RequestParam("id") Integer id) { + if (null == id) { + ResultUtils.buildParameterErrorResultAndWrite(response, "请选择需要删除的数据"); + return; + } + Integer count = checkItemManageService.deleteCheckItemManage(id); + if (count == 0 || count == null) { + ResultUtils.buildParameterErrorResultAndWrite(response, "删除数据失败!!"); + return; + } else { + ResultUtils.buildSuccessResultAndWrite(response, "删除成功!"); + return; + } + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java index e9129d5..d62c223 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java @@ -24,21 +24,23 @@ import java.util.*; * Created by Administrator on 2017-04-24. */ @Intercepts({ - @Signature(type = Executor.class, method = "update", args = { MappedStatement.class,Object.class }), - @Signature(type= ResultSetHandler.class, method = "handleResultSets", args = {Statement.class}) - }) + @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class}), + @Signature(type = ResultSetHandler.class, method = "handleResultSets", args = {Statement.class}) +}) public class MybatisSqlInterceptor implements Interceptor { //同步的表 private static Set uses = new HashSet<>(); //不同步的表 private static Set noUses = new HashSet<>(); + static { uses.add("departments"); uses.add("organization"); uses.add("roles"); uses.add("users"); + noUses.add("baby_patient_extend_ear"); noUses.add("baby_patient_extend_ear_birth"); noUses.add("baby_patient_extend_ear_family"); @@ -69,23 +71,22 @@ public class MybatisSqlInterceptor implements Interceptor { noUses.add("role_permission_maps"); noUses.add("user_organization_maps"); noUses.add("user_role_maps"); + noUses.add("lyms_week_project"); } private String sql; private Properties properties; - private String sqlCommandType; + private String sqlCommandType; - private String sqlId; + private String sqlId; public Object intercept(Invocation invocation) throws Throwable { Object[] args = invocation.getArgs(); - Object returnValue = null; - try - { - if (args != null && args.length == 2) - { + Object returnValue = null; + try { + if (args != null && args.length == 2) { MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0]; Object parameter = null; if (invocation.getArgs().length > 1) { @@ -95,29 +96,22 @@ public class MybatisSqlInterceptor implements Interceptor { BoundSql boundSql = mappedStatement.getBoundSql(parameter); Configuration configuration = mappedStatement.getConfiguration(); sqlCommandType = mappedStatement.getSqlCommandType().name(); - if ("insert".equals(sqlCommandType.toLowerCase()) ) - { + if ("insert".equals(sqlCommandType.toLowerCase())) { String tempSql = getSql(configuration, boundSql, sqlId); - if (isSyncTable(tempSql)) - { + if (isSyncTable(tempSql)) { sql = tempSql; } } - returnValue = invocation.proceed(); - } - else - { - returnValue = invocation.proceed(); - if (StringUtils.isNotEmpty(sql) && sqlCommandType != null && "insert".equals(sqlCommandType.toLowerCase())) - { - if (returnValue != null && returnValue instanceof ArrayList) - { - List list = (ArrayList)returnValue; - if (CollectionUtils.isNotEmpty(list)) - { - sql = sql.replaceFirst("\\(","(ID,"); - sql = sql.substring(0,sql.lastIndexOf("(")+1)+list.get(0)+","+sql.substring(sql.lastIndexOf("(")+1,sql.length()); - System.out.println("add sync sql = "+sql); + returnValue = invocation.proceed(); + } else { + returnValue = invocation.proceed(); + if (StringUtils.isNotEmpty(sql) && sqlCommandType != null && "insert".equals(sqlCommandType.toLowerCase())) { + if (returnValue != null && returnValue instanceof ArrayList) { + List list = (ArrayList) returnValue; + if (CollectionUtils.isNotEmpty(list)) { + sql = sql.replaceFirst("\\(", "(ID,"); + sql = sql.substring(0, sql.lastIndexOf("(") + 1) + list.get(0) + "," + sql.substring(sql.lastIndexOf("(") + 1, sql.length()); + System.out.println("add sync sql = " + sql); //发送要同步的sql SendMysqlSyncDatUtil.addSqlToQueue(sql, sqlId); sql = null; @@ -125,9 +119,8 @@ public class MybatisSqlInterceptor implements Interceptor { } } } - }catch (Exception e) - { - ExceptionUtils.catchException(e," Mybatis Sql Interceptor exception"); + } catch (Exception e) { + ExceptionUtils.catchException(e, " Mybatis Sql Interceptor exception"); } return returnValue; } @@ -135,31 +128,26 @@ public class MybatisSqlInterceptor implements Interceptor { /** * 判断sql中的表是否要同步的 + * * @param sql * @return */ - private boolean isSyncTable(String sql) - { + private boolean isSyncTable(String sql) { boolean use = false; boolean nouse = true; - if (StringUtils.isEmpty(sql)) - { + if (StringUtils.isEmpty(sql)) { return use; } - for(String key : uses) - { - if (sql.toLowerCase().contains(key)) - { - use = true; + for (String key : uses) { + if (sql.toLowerCase().contains(key)) { + use = true; break; } } - for(String key : noUses) - { - if (sql.toLowerCase().contains(key)) - { - nouse = false; + for (String key : noUses) { + if (sql.toLowerCase().contains(key)) { + nouse = false; break; } } @@ -172,7 +160,7 @@ public class MybatisSqlInterceptor implements Interceptor { return sql; } - private static String getParameterValue(Object obj,String javaType) { + private static String getParameterValue(Object obj, String javaType) { String value = null; if (obj instanceof String) { value = "'" + obj.toString() + "'"; @@ -182,8 +170,7 @@ public class MybatisSqlInterceptor implements Interceptor { } else { if (obj != null) { value = obj.toString(); - } else - { + } else { value = "null"; } } @@ -197,7 +184,7 @@ public class MybatisSqlInterceptor implements Interceptor { if (parameterMappings.size() > 0 && parameterObject != null) { TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry(); if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) { - sql = sql.replaceFirst("\\?", getParameterValue(parameterObject,parameterObject.getClass().getName())); + sql = sql.replaceFirst("\\?", getParameterValue(parameterObject, parameterObject.getClass().getName())); } else { MetaObject metaObject = configuration.newMetaObject(parameterObject); @@ -205,10 +192,10 @@ public class MybatisSqlInterceptor implements Interceptor { String propertyName = parameterMapping.getProperty(); if (metaObject.hasGetter(propertyName)) { Object obj = metaObject.getValue(propertyName); - sql = sql.replaceFirst("\\?", getParameterValue(obj,parameterMapping.getJavaType().getName())); + sql = sql.replaceFirst("\\?", getParameterValue(obj, parameterMapping.getJavaType().getName())); } else if (boundSql.hasAdditionalParameter(propertyName)) { Object obj = boundSql.getAdditionalParameter(propertyName); - sql = sql.replaceFirst("\\?", getParameterValue(obj,parameterMapping.getJavaType().getName())); + sql = sql.replaceFirst("\\?", getParameterValue(obj, parameterMapping.getJavaType().getName())); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 860f628..fc14e66 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -26,11 +26,15 @@ public class AntExAddRequest implements IBasicRequestConvert> treatmentOpinion2; private List treatmentOpinion2Types; - /** 胎动情况 */ + /** + * 胎动情况 + */ private String quicken; private String quickenRemark; private String vcCardNo; @@ -150,7 +154,7 @@ public class AntExAddRequest implements IBasicRequestConvert thyStim; + public Map thyStim; //抗甲状腺球蛋白抗体（TGA） public String antGlan; //抗甲状腺微粒体抗体(TMA) @@ -191,7 +195,9 @@ public class AntExAddRequest implements IBasicRequestConvert mHighRiskReason) { this.mHighRiskReason = mHighRiskReason; } + public String getQuickenRemark() { return quickenRemark; } @@ -894,7 +915,7 @@ public class AntExAddRequest implements IBasicRequestConvert { //浮肿 private String edema; + /** + * 产检项 + */ + private String configItemId; + + public String getConfigItemId() { + return configItemId; + } + + public void setConfigItemId(String configItemId) { + this.configItemId = configItemId; + } + public String getVcCardNo() { return vcCardNo; } @@ -394,6 +407,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { public void setGynRemark(String gynRemark) { this.gynRemark = gynRemark; } + public String getYqweight() { return yqweight; } @@ -441,6 +455,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { public void setmHighRiskReason(List mHighRiskReason) { this.mHighRiskReason = mHighRiskReason; } + public String getCweight() { return cweight; } @@ -1792,6 +1807,12 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setFuwei(fuwei); antExChuModel.setTireNumber1(tireNumber1); antExChuModel.setPlacentas(placentas); + /** + * 产检项 + * */ + antExChuModel.setConfigItemId(configItemId); + + if (null != bp) { antExChuModel.setBp(JsonUtil.obj2JsonString(bp)); } diff --git a/platform-operate-api/src/main/resources/spring/applicationContext.xml b/platform-operate-api/src/main/resources/spring/applicationContext.xml index 04a78cd..219ba2b 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext.xml @@ -22,9 +22,9 @@ - - - + + + @@ -42,7 +42,7 @@ - + @@ -63,12 +63,12 @@ - + - +