Commit 77a61a7f183cdc246edcb5dad4c9b01ecfe4672f
1 parent
4c7a8758b1
Exists in
master
解决冲突
Showing 16 changed files with 236 additions and 72 deletions
- parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistoryMapsMapper.java
- parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistoryMapsMapper.xml
- parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistorySourceMapper.java
- parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistorySourceMapper.xml
- parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistoryMaps.java
- parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java
- parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
- parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
- parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/HistorySourceService.java
- parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistorySourceServiceImpl.java
- parent/hospital.web/src/main/java/com/lyms/hospital/controller/CommonApiController.java
- parent/hospital.web/src/main/java/com/lyms/hospital/controller/history/MedicalHistoryController.java
- parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java
- parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequest.java
- parent/hospital.web/src/test/java/test/hospital/service/HistorySourceServiceTest.java
- parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistoryMapsMapper.java
View file @
77a61a7
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistoryMapsMapper.xml
View file @
77a61a7
| ... | ... | @@ -5,14 +5,17 @@ |
| 5 | 5 | <!-- 通用查询映射结果 --> |
| 6 | 6 | <resultMap id="BaseResultMap" type="com.lyms.hospital.entity.history.HistoryMaps"> |
| 7 | 7 | <id column="ID" property="id" /> |
| 8 | + <result column="WOMAN_PERSON_ID" property="womanPersonId" /> | |
| 8 | 9 | <result column="WOMAN_ID" property="womanId" /> |
| 9 | 10 | <result column="SOUCE_ID" property="souceId" /> |
| 10 | 11 | <result column="OTHER_TXT" property="otherTxt" /> |
| 12 | + <result column="TARGET_ID" property="targetId" /> | |
| 13 | + <result column="TARGET_TYPE" property="targetType" /> | |
| 11 | 14 | </resultMap> |
| 12 | 15 | |
| 13 | 16 | <!-- 通用查询结果列 --> |
| 14 | 17 | <sql id="Base_Column_List"> |
| 15 | - ID AS id, WOMAN_ID AS womanId, SOUCE_ID AS souceId, OTHER_TXT AS otherTxt | |
| 18 | + ID AS id, WOMAN_PERSON_ID AS womanPersonId, WOMAN_ID AS womanId, SOUCE_ID AS souceId, OTHER_TXT AS otherTxt, TARGET_ID AS targetId, TARGET_TYPE AS targetType | |
| 16 | 19 | </sql> |
| 17 | 20 | </mapper> |
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistorySourceMapper.java
View file @
77a61a7
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistorySourceMapper.xml
View file @
77a61a7
| ... | ... | @@ -8,14 +8,15 @@ |
| 8 | 8 | <result column="PID" property="pid" /> |
| 9 | 9 | <result column="NAME" property="name" /> |
| 10 | 10 | <result column="TYPE" property="type" /> |
| 11 | - <result column="ITEMORDER" property="itemorder" /> | |
| 11 | + <result column="ITEM_ORDER" property="itemOrder" /> | |
| 12 | 12 | <result column="LEVEL" property="level" /> |
| 13 | 13 | <result column="ENABLE" property="enable" /> |
| 14 | + <result column="HAS_TEXT" property="hasText" /> | |
| 14 | 15 | </resultMap> |
| 15 | 16 | |
| 16 | 17 | <!-- 通用查询结果列 --> |
| 17 | 18 | <sql id="Base_Column_List"> |
| 18 | - ID AS id, PID AS pid, NAME AS name, TYPE AS type, ITEMORDER AS itemorder, LEVEL AS level, ENABLE AS enable | |
| 19 | + ID AS id, PID AS pid, NAME AS name, TYPE AS type, ITEM_ORDER AS itemOrder, LEVEL AS level, ENABLE AS enable, HAS_TEXT AS hasText | |
| 19 | 20 | </sql> |
| 20 | 21 | </mapper> |
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistoryMaps.java
View file @
77a61a7
| ... | ... | @@ -10,8 +10,8 @@ |
| 10 | 10 | * 病史信息记录表 |
| 11 | 11 | * </p> |
| 12 | 12 | * |
| 13 | - * @author fangcheng | |
| 14 | - * @since 2017-03-28 | |
| 13 | + * @author xujiahong | |
| 14 | + * @since 2017-04-27 | |
| 15 | 15 | */ |
| 16 | 16 | @TableName("HISTORY_MAPS") |
| 17 | 17 | public class HistoryMaps implements Serializable { |
| ... | ... | @@ -24,6 +24,11 @@ |
| 24 | 24 | @TableId(value="ID") |
| 25 | 25 | private String id; |
| 26 | 26 | /** |
| 27 | + * 女性居民ID | |
| 28 | + */ | |
| 29 | + @TableField(value="WOMAN_PERSON_ID") | |
| 30 | + private String womanPersonId; | |
| 31 | + /** | |
| 27 | 32 | * |
| 28 | 33 | */ |
| 29 | 34 | @TableField(value="WOMAN_ID") |
| ... | ... | @@ -38,6 +43,16 @@ |
| 38 | 43 | */ |
| 39 | 44 | @TableField(value="OTHER_TXT") |
| 40 | 45 | private String otherTxt; |
| 46 | + /** | |
| 47 | + * 关联目标ID:产检ID、女性档案ID | |
| 48 | + */ | |
| 49 | + @TableField(value="TARGET_ID") | |
| 50 | + private String targetId; | |
| 51 | + /** | |
| 52 | + * 关联目标类型:1产检 | |
| 53 | + */ | |
| 54 | + @TableField(value="TARGET_TYPE") | |
| 55 | + private Integer targetType; | |
| 41 | 56 | |
| 42 | 57 | |
| 43 | 58 | public String getId() { |
| ... | ... | @@ -48,6 +63,14 @@ |
| 48 | 63 | this.id = id; |
| 49 | 64 | } |
| 50 | 65 | |
| 66 | + public String getWomanPersonId() { | |
| 67 | + return womanPersonId; | |
| 68 | + } | |
| 69 | + | |
| 70 | + public void setWomanPersonId(String womanPersonId) { | |
| 71 | + this.womanPersonId = womanPersonId; | |
| 72 | + } | |
| 73 | + | |
| 51 | 74 | public String getWomanId() { |
| 52 | 75 | return womanId; |
| 53 | 76 | } |
| ... | ... | @@ -70,6 +93,22 @@ |
| 70 | 93 | |
| 71 | 94 | public void setOtherTxt(String otherTxt) { |
| 72 | 95 | this.otherTxt = otherTxt; |
| 96 | + } | |
| 97 | + | |
| 98 | + public String getTargetId() { | |
| 99 | + return targetId; | |
| 100 | + } | |
| 101 | + | |
| 102 | + public void setTargetId(String targetId) { | |
| 103 | + this.targetId = targetId; | |
| 104 | + } | |
| 105 | + | |
| 106 | + public Integer getTargetType() { | |
| 107 | + return targetType; | |
| 108 | + } | |
| 109 | + | |
| 110 | + public void setTargetType(Integer targetType) { | |
| 111 | + this.targetType = targetType; | |
| 73 | 112 | } |
| 74 | 113 | |
| 75 | 114 | } |
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java
View file @
77a61a7
| ... | ... | @@ -13,56 +13,61 @@ |
| 13 | 13 | * 病史项定义资源表 |
| 14 | 14 | * </p> |
| 15 | 15 | * |
| 16 | - * @author fangcheng | |
| 17 | - * @since 2017-03-29 | |
| 16 | + * @author xujiahong | |
| 17 | + * @since 2017-04-27 | |
| 18 | 18 | */ |
| 19 | 19 | @TableName("HISTORY_SOURCE") |
| 20 | 20 | public class HistorySource implements Serializable { |
| 21 | 21 | |
| 22 | - private static final long serialVersionUID = 1L; | |
| 22 | + private static final long serialVersionUID = 1L; | |
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | - * | |
| 25 | + * 节点ID | |
| 26 | 26 | */ |
| 27 | - @TableId(value="ID") | |
| 27 | + @TableId(value = "ID") | |
| 28 | 28 | private String id; |
| 29 | 29 | /** |
| 30 | - * 本表上级ID | |
| 30 | + * 上级节点ID | |
| 31 | 31 | */ |
| 32 | - @TableField(value="PID") | |
| 32 | + @TableField(value = "PID") | |
| 33 | 33 | private String pid; |
| 34 | 34 | /** |
| 35 | 35 | * 病史项名称 |
| 36 | 36 | */ |
| 37 | - @TableField(value="NAME") | |
| 37 | + @TableField(value = "NAME") | |
| 38 | 38 | private String name; |
| 39 | 39 | /** |
| 40 | - * 既往史、家族史、个人史 | |
| 40 | + * 节点描述(多用于顶级节点) | |
| 41 | 41 | */ |
| 42 | - @TableField(value="TYPE") | |
| 42 | + @TableField(value = "TYPE") | |
| 43 | 43 | private String type; |
| 44 | 44 | /** |
| 45 | - * | |
| 45 | + * 节点顺序 | |
| 46 | 46 | */ |
| 47 | - @TableField(value="ITEMORDER") | |
| 48 | - private String itemorder; | |
| 47 | + @TableField(value = "ITEM_ORDER") | |
| 48 | + private String itemOrder; | |
| 49 | 49 | /** |
| 50 | - * 本记录层级,1,2,3 | |
| 50 | + * 节点层级,1,2,3(略) | |
| 51 | 51 | */ |
| 52 | - @TableField(value="LEVEL") | |
| 52 | + @TableField(value = "LEVEL") | |
| 53 | 53 | private String level; |
| 54 | 54 | /** |
| 55 | 55 | * 是否启用,默认1启用 |
| 56 | 56 | */ |
| 57 | - @TableField(value="ENABLE") | |
| 57 | + @TableField(value = "ENABLE") | |
| 58 | 58 | private Integer enable; |
| 59 | - | |
| 60 | 59 | /** |
| 60 | + * 是否附带文本:1是,0否 | |
| 61 | + */ | |
| 62 | + @TableField(value = "HAS_TEXT") | |
| 63 | + private Integer hasText; | |
| 64 | + | |
| 65 | + /** | |
| 61 | 66 | * 子级别元素 |
| 62 | 67 | */ |
| 63 | - @TableField(exist=false) | |
| 68 | + @TableField(exist = false) | |
| 64 | 69 | private List<HistorySource> children = InstanceUtils.newArrayList(); |
| 65 | - | |
| 70 | + | |
| 66 | 71 | public String getId() { |
| 67 | 72 | return id; |
| 68 | 73 | } |
| 69 | 74 | |
| ... | ... | @@ -95,12 +100,12 @@ |
| 95 | 100 | this.type = type; |
| 96 | 101 | } |
| 97 | 102 | |
| 98 | - public String getItemorder() { | |
| 99 | - return itemorder; | |
| 103 | + public String getItemOrder() { | |
| 104 | + return itemOrder; | |
| 100 | 105 | } |
| 101 | 106 | |
| 102 | - public void setItemorder(String itemorder) { | |
| 103 | - this.itemorder = itemorder; | |
| 107 | + public void setItemOrder(String itemOrder) { | |
| 108 | + this.itemOrder = itemOrder; | |
| 104 | 109 | } |
| 105 | 110 | |
| 106 | 111 | public String getLevel() { |
| 107 | 112 | |
| ... | ... | @@ -119,15 +124,21 @@ |
| 119 | 124 | this.enable = enable; |
| 120 | 125 | } |
| 121 | 126 | |
| 122 | - public List<HistorySource> getChildren() { | |
| 123 | - return children; | |
| 124 | - } | |
| 127 | + public Integer getHasText() { | |
| 128 | + return hasText; | |
| 129 | + } | |
| 125 | 130 | |
| 126 | - public void setChildren(List<HistorySource> children) { | |
| 127 | - this.children = children; | |
| 128 | - } | |
| 129 | - | |
| 130 | - | |
| 131 | + public void setHasText(Integer hasText) { | |
| 132 | + this.hasText = hasText; | |
| 133 | + } | |
| 134 | + | |
| 135 | + public List<HistorySource> getChildren() { | |
| 136 | + return children; | |
| 137 | + } | |
| 138 | + | |
| 139 | + public void setChildren(List<HistorySource> children) { | |
| 140 | + this.children = children; | |
| 141 | + } | |
| 131 | 142 | |
| 132 | 143 | } |
parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
View file @
77a61a7
| ... | ... | @@ -3,12 +3,11 @@ |
| 3 | 3 | import java.io.Serializable; |
| 4 | 4 | import java.util.List; |
| 5 | 5 | |
| 6 | -import com.lyms.hospital.entity.assist.DiagnoseAssit; | |
| 7 | 6 | import com.lyms.base.common.entity.conf.HighriskConf; |
| 7 | +import com.lyms.hospital.entity.assist.DiagnoseAssit; | |
| 8 | 8 | import com.lyms.hospital.entity.diagnose.DiagnoseInfo; |
| 9 | 9 | import com.lyms.hospital.entity.history.HistoryMaps; |
| 10 | 10 | import com.lyms.web.service.BaseService; |
| 11 | -import java.util.List; | |
| 12 | 11 | |
| 13 | 12 | /** |
| 14 | 13 | * <p> |
parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
View file @
77a61a7
parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/HistorySourceService.java
View file @
77a61a7
parent/hospital.mac/src/main/java/com/lyms/hospital/service/history/impl/HistorySourceServiceImpl.java
View file @
77a61a7
| ... | ... | @@ -34,7 +34,7 @@ |
| 34 | 34 | if(historyPatientType.length > 0){ |
| 35 | 35 | ew.and("type={0}", historyPatientType[0]); |
| 36 | 36 | } |
| 37 | - ew.orderBy("itemorder"); | |
| 37 | + ew.orderBy("itemOrder"); | |
| 38 | 38 | dataList = selectList(ew); |
| 39 | 39 | return dataList; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | |
| ... | ... | @@ -44,15 +44,22 @@ |
| 44 | 44 | List<HistorySource> dbdataList = selectByType(HistoryPatientType); |
| 45 | 45 | List<HistorySource> firstdataList = InstanceUtils.newArrayList(); |
| 46 | 46 | Map<String,HistorySource> firstLevelData = InstanceUtils.newHashMap(); |
| 47 | + Map<String,HistorySource> level2Data = InstanceUtils.newHashMap(); | |
| 47 | 48 | for(HistorySource historySource : dbdataList){ |
| 48 | 49 | if("1".equals(historySource.getLevel())){ |
| 49 | - firstdataList.add(historySource); | |
| 50 | - firstLevelData.put(historySource.getId(), historySource); | |
| 50 | + firstdataList.add(historySource);//最终只返回一级列表,其他层级以子类形式返回 | |
| 51 | + firstLevelData.put(historySource.getId(), historySource);//一级对象 | |
| 51 | 52 | } |
| 52 | 53 | } |
| 53 | 54 | for(HistorySource historySource : dbdataList){ |
| 54 | 55 | if("2".equals(historySource.getLevel())){ |
| 55 | 56 | firstLevelData.get(historySource.getPid()).getChildren().add(historySource); |
| 57 | + level2Data.put(historySource.getId(), historySource);//二级对象 | |
| 58 | + } | |
| 59 | + } | |
| 60 | + for(HistorySource historySource : dbdataList){ | |
| 61 | + if("3".equals(historySource.getLevel())){ | |
| 62 | + level2Data.get(historySource.getPid()).getChildren().add(historySource); | |
| 56 | 63 | } |
| 57 | 64 | } |
| 58 | 65 | return firstdataList; |
parent/hospital.web/src/main/java/com/lyms/hospital/controller/CommonApiController.java
View file @
77a61a7
| ... | ... | @@ -13,7 +13,9 @@ |
| 13 | 13 | |
| 14 | 14 | import com.lyms.base.common.entity.region.Regions; |
| 15 | 15 | import com.lyms.base.common.service.region.RegionsService; |
| 16 | +import com.lyms.hospital.entity.history.HistorySource; | |
| 16 | 17 | import com.lyms.hospital.enums.ServiceStatusEnums; |
| 18 | +import com.lyms.hospital.service.history.HistorySourceService; | |
| 17 | 19 | import com.lyms.hospital.util.trans.OldDictionary; |
| 18 | 20 | import com.lyms.hospital.util.trans.XjhMapUtil; |
| 19 | 21 | import com.lyms.web.bean.AjaxResult; |
| 20 | 22 | |
| 21 | 23 | |
| 22 | 24 | |
| ... | ... | @@ -21,19 +23,32 @@ |
| 21 | 23 | |
| 22 | 24 | /** |
| 23 | 25 | * <p> |
| 24 | - * 公用接口-前端控制器 | |
| 26 | + * 公用接口-前端控制器 | |
| 25 | 27 | * </p> |
| 26 | - * | |
| 28 | + * | |
| 29 | + * -查询病史配置<br> | |
| 30 | + * -查询省市区数据<br> | |
| 31 | + * -查询字典数据<br> | |
| 32 | + * | |
| 27 | 33 | * @author xujiahong |
| 28 | 34 | * @since 2017-04-21 |
| 29 | 35 | */ |
| 30 | 36 | @Controller |
| 31 | 37 | @RequestMapping("/commonApi") |
| 32 | 38 | public class CommonApiController extends BaseController { |
| 33 | - | |
| 39 | + | |
| 34 | 40 | @Autowired |
| 35 | 41 | private RegionsService regionService; |
| 36 | - | |
| 42 | + @Autowired | |
| 43 | + private HistorySourceService historySourceService; | |
| 44 | + | |
| 45 | + @RequestMapping(value = "/queryHistorySource", method = RequestMethod.GET) | |
| 46 | + @ResponseBody | |
| 47 | + public AjaxResult queryHistorySource() { | |
| 48 | + List<HistorySource> list = historySourceService.selectStructureByType(); | |
| 49 | + return AjaxResult.returnSuccess(list); | |
| 50 | + } | |
| 51 | + | |
| 37 | 52 | /** |
| 38 | 53 | * <li>@Description:查询省市区数据 |
| 39 | 54 | * <li>@param parentId |
| ... | ... | @@ -45,7 +60,7 @@ |
| 45 | 60 | */ |
| 46 | 61 | @RequestMapping(value = "/queryRegions", method = RequestMethod.GET) |
| 47 | 62 | @ResponseBody |
| 48 | - public AjaxResult queryRegions (String parentId){ | |
| 63 | + public AjaxResult queryRegions(String parentId) { | |
| 49 | 64 | List<Regions> list = regionService.selectRegions(parentId); |
| 50 | 65 | return AjaxResult.returnSuccess(list); |
| 51 | 66 | } |
| 52 | 67 | |
| 53 | 68 | |
| 54 | 69 | |
| 55 | 70 | |
| 56 | 71 | |
| 57 | 72 | |
| 58 | 73 | |
| 59 | 74 | |
| 60 | 75 | |
| ... | ... | @@ -60,42 +75,43 @@ |
| 60 | 75 | */ |
| 61 | 76 | @RequestMapping(value = "/queryDictionary", method = RequestMethod.GET) |
| 62 | 77 | @ResponseBody |
| 63 | - public AjaxResult queryDictionary (){ | |
| 64 | - //TODO 模拟查询数据字典的数据 | |
| 65 | - Map<String,Object> dictionary = new HashMap<>(); | |
| 66 | - /*户口类型*/ | |
| 78 | + public AjaxResult queryDictionary() { | |
| 79 | + // TODO 模拟查询数据字典的数据 | |
| 80 | + Map<String, Object> dictionary = new HashMap<>(); | |
| 81 | + /* 户口类型 */ | |
| 67 | 82 | List<Map<String, Object>> censusType = new ArrayList<>(); |
| 68 | 83 | censusType.add(XjhMapUtil.transBean2Map(new OldDictionary("001", "非农业户口"))); |
| 69 | 84 | censusType.add(XjhMapUtil.transBean2Map(new OldDictionary("002", "农业户口"))); |
| 70 | - /*证件类型*/ | |
| 85 | + /* 证件类型 */ | |
| 71 | 86 | List<Map<String, Object>> certeType = new ArrayList<>(); |
| 72 | 87 | certeType.add(XjhMapUtil.transBean2Map(new OldDictionary("003", "身份证"))); |
| 73 | 88 | certeType.add(XjhMapUtil.transBean2Map(new OldDictionary("004", "手机号"))); |
| 74 | - /*国家*/ | |
| 89 | + /* 国家 */ | |
| 75 | 90 | List<Map<String, Object>> country = new ArrayList<>(); |
| 76 | 91 | country.add(XjhMapUtil.transBean2Map(new OldDictionary("005", "中国"))); |
| 77 | 92 | country.add(XjhMapUtil.transBean2Map(new OldDictionary("006", "美国"))); |
| 78 | - /*vip体验类型*/ | |
| 93 | + /* vip体验类型 */ | |
| 79 | 94 | List<Map<String, Object>> expYunEnums = new ArrayList<>(); |
| 80 | 95 | expYunEnums.add(XjhMapUtil.transBean2Map(new OldDictionary("007", "vip体验类型1"))); |
| 81 | 96 | expYunEnums.add(XjhMapUtil.transBean2Map(new OldDictionary("008", "vip体验类型2"))); |
| 82 | - /*居住类型*/ | |
| 97 | + /* 居住类型 */ | |
| 83 | 98 | List<Map<String, Object>> liveType = new ArrayList<>(); |
| 84 | 99 | liveType.add(XjhMapUtil.transBean2Map(new OldDictionary("009", "本地"))); |
| 85 | 100 | liveType.add(XjhMapUtil.transBean2Map(new OldDictionary("010", "非本地"))); |
| 86 | - /*民族*/ | |
| 101 | + /* 民族 */ | |
| 87 | 102 | List<Map<String, Object>> nation = new ArrayList<>(); |
| 88 | 103 | nation.add(XjhMapUtil.transBean2Map(new OldDictionary("011", "汉族"))); |
| 89 | 104 | nation.add(XjhMapUtil.transBean2Map(new OldDictionary("012", "白族"))); |
| 90 | - /*职业类型*/ | |
| 105 | + /* 职业类型 */ | |
| 91 | 106 | List<Map<String, Object>> professionType = new ArrayList<>(); |
| 92 | 107 | professionType.add(XjhMapUtil.transBean2Map(new OldDictionary("013", "医生"))); |
| 93 | 108 | professionType.add(XjhMapUtil.transBean2Map(new OldDictionary("014", "教师"))); |
| 94 | - /*服务状态*/ | |
| 109 | + | |
| 110 | + /* 服务状态 */ | |
| 95 | 111 | List<Map<String, String>> serviceStatus = ServiceStatusEnums.getServiceStatusList(); |
| 96 | - /*服务类型*/ | |
| 112 | + /* 服务类型 */ | |
| 97 | 113 | List<Map<String, String>> serviceType = ServiceStatusEnums.getServiceTypeList(); |
| 98 | - | |
| 114 | + | |
| 99 | 115 | dictionary.put("censusType", censusType); |
| 100 | 116 | dictionary.put("certeType", certeType); |
| 101 | 117 | dictionary.put("country", country); |
parent/hospital.web/src/main/java/com/lyms/hospital/controller/history/MedicalHistoryController.java
View file @
77a61a7
| 1 | +package com.lyms.hospital.controller.history; | |
| 2 | + | |
| 3 | +import org.springframework.stereotype.Controller; | |
| 4 | +import org.springframework.web.bind.annotation.RequestMapping; | |
| 5 | + | |
| 6 | +import com.lyms.web.controller.BaseController; | |
| 7 | + | |
| 8 | +/** | |
| 9 | + * 病史-控制器<br> | |
| 10 | + * | |
| 11 | + * | |
| 12 | + * | |
| 13 | + * @author xujiahong | |
| 14 | + * | |
| 15 | + */ | |
| 16 | +@Controller | |
| 17 | +@RequestMapping("/medicalHistory") | |
| 18 | +public class MedicalHistoryController extends BaseController { | |
| 19 | + | |
| 20 | +} |
parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java
View file @
77a61a7
parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequest.java
View file @
77a61a7
parent/hospital.web/src/test/java/test/hospital/service/HistorySourceServiceTest.java
View file @
77a61a7
| 1 | +package test.hospital.service; | |
| 2 | + | |
| 3 | +import java.util.List; | |
| 4 | + | |
| 5 | +import org.junit.Test; | |
| 6 | +import org.springframework.beans.factory.annotation.Autowired; | |
| 7 | + | |
| 8 | +import com.alibaba.fastjson.JSONObject; | |
| 9 | +import com.lyms.hospital.entity.history.HistorySource; | |
| 10 | +import com.lyms.hospital.service.history.HistorySourceService; | |
| 11 | + | |
| 12 | +import test.hospital.BaseServiceTest; | |
| 13 | + | |
| 14 | +public class HistorySourceServiceTest extends BaseServiceTest { | |
| 15 | + | |
| 16 | + @Autowired | |
| 17 | + private HistorySourceService historySourceService; | |
| 18 | + | |
| 19 | + @Test | |
| 20 | + public void selectStructureByType(){ | |
| 21 | + List<HistorySource> list = historySourceService.selectStructureByType(); | |
| 22 | + System.out.println(JSONObject.toJSONString(list)); | |
| 23 | + } | |
| 24 | + | |
| 25 | + | |
| 26 | + @Test | |
| 27 | + public void insertTestData(){ | |
| 28 | + String[] father = {"既往史","家族史","个人史","疫苗接种史","药物过敏史","妇科手术史","叶酸服用","本次妊娠情况","丈夫健康情况"}; | |
| 29 | + String[] fatherCode = {"JWS","JZS","GRS","YMJZS","YWGMS","FKSSS","YSFY","BCRSQK","ZFJKQK"}; | |
| 30 | +// for(int i=0;i<father.length;i++){ | |
| 31 | +// HistorySource source = new HistorySource(); | |
| 32 | +// source.setId((i+1)*100+""); | |
| 33 | +// source.setPid("0"); | |
| 34 | +// source.setName(father[i]); | |
| 35 | +// source.setCode(fatherCode[i]); | |
| 36 | +// source.setItemOrder((i+1)+""); | |
| 37 | +// source.setLevel("1"); | |
| 38 | +// source.setEnable(1); | |
| 39 | +// source.setHasText(0); | |
| 40 | +// historySourceService.insert(source); | |
| 41 | +// } | |
| 42 | +// for(int i=1;i<father.length;i++){ | |
| 43 | +// for(int j=0;j<5;j++){ | |
| 44 | +// HistorySource source = new HistorySource(); | |
| 45 | +// source.setId((i+1)*100+(j+1)+""); | |
| 46 | +// source.setPid((i+1)*100+""); | |
| 47 | +// source.setName(father[i]+(j+1)); | |
| 48 | +// source.setCode(fatherCode[i]); | |
| 49 | +// source.setItemOrder((j+1)+""); | |
| 50 | +// source.setLevel("2"); | |
| 51 | +// source.setEnable(1); | |
| 52 | +// source.setHasText(0); | |
| 53 | +// historySourceService.insert(source); | |
| 54 | +// } | |
| 55 | +// } | |
| 56 | + | |
| 57 | + } | |
| 58 | + | |
| 59 | +} |
parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java
View file @
77a61a7
| ... | ... | @@ -44,16 +44,16 @@ |
| 44 | 44 | |
| 45 | 45 | private static void customSet(GlobalConfig gc, StrategyConfig strategy, PackageConfig pc) { |
| 46 | 46 | gc.setOutputDir("D://mybatis-plus-generate"); |
| 47 | - gc.setAuthor("fangcheng"); | |
| 47 | + gc.setAuthor("xujiahong"); | |
| 48 | 48 | |
| 49 | 49 | // strategy.setInclude(new String[] { |
| 50 | 50 | // "SYS_USERS","SYS_USER_ROLE_MAPS","SYS_ROLES" }); // 需要生成的表 |
| 51 | - strategy.setInclude(new String[] { "SYS_USER_DATA_PERMISSIONS"}); // 需要生成的表 | |
| 52 | -// pc.setParent("com.lyms.hospital"); | |
| 53 | - pc.setParent("com.lyms.base.common"); | |
| 51 | + strategy.setInclude(new String[] { "HISTORY_SOURCE","HISTORY_MAPS"}); // 需要生成的表 | |
| 52 | + pc.setParent("com.lyms.hospital"); | |
| 53 | +// pc.setParent("com.lyms.base.common"); | |
| 54 | 54 | |
| 55 | 55 | // 加在controller后面 |
| 56 | - pc.setFunctionName("user"); // com.lyms.hospital.web.controller.sys | |
| 56 | + pc.setFunctionName("history"); // com.lyms.hospital.web.controller.sys | |
| 57 | 57 | // pc.setModuleName("sys"); //com.lyms.hospital.sys.controller |
| 58 | 58 | // 加在controller前面 |
| 59 | 59 | |
| 60 | 60 | |
| ... | ... | @@ -103,9 +103,9 @@ |
| 103 | 103 | DataSourceConfig dsc = new DataSourceConfig(); |
| 104 | 104 | dsc.setDbType(DbType.MYSQL); |
| 105 | 105 | dsc.setDriverName("com.mysql.jdbc.Driver"); |
| 106 | - dsc.setUsername("center"); | |
| 106 | + dsc.setUsername("hospital");//center | |
| 107 | 107 | dsc.setPassword("lyms2015"); |
| 108 | - dsc.setUrl("jdbc:mysql://119.90.57.26:3306/center?characterEncoding=utf8"); | |
| 108 | + dsc.setUrl("jdbc:mysql://119.90.57.26:3306/hospital?characterEncoding=utf8"); | |
| 109 | 109 | mpg.setDataSource(dsc); |
| 110 | 110 | |
| 111 | 111 | // 策略配置 |