jiangjiazhi / center

Download as
Browse Code »

Commit bea667a43116d5b97d7b02823c67565748f53cf5

Authored by xujiahong
1 parent d38661b9f4
Exists in master

解决冲突

Showing 10 changed files with 2073 additions and 534 deletions

parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml View file @ bea667a
... ... @@ -20,7 +20,7 @@
20 20 <result column="BIRTHDEFECT_NUM" property="birthdefectNum" />
21 21 <result column="HEIGHT" property="height" />
22 22 <result column="WEIGHT" property="weight" />
23   - <result column="HEIGHT_AGO" property="heightAgo" />
  23 + <result column="WEIGHT_AGO" property="weightAgo" />
24 24 <result column="WEIGHT_INDEX" property="weightIndex" />
25 25 <result column="BLOOD_SHRINK" property="bloodShrink" />
26 26 <result column="BLOOD_DIASTOLE" property="bloodDiastole" />
27 27  
... ... @@ -42,11 +42,68 @@
42 42 <result column="DOCTOR_ID" property="doctorId" />
43 43 <result column="ORG_ID" property="orgId" />
44 44 <result column="DIAGNOSE_TIME" property="diagnoseTime" />
45   - </resultMap>
46 45  
47   - <!-- 通用查询结果列 -->
48   - <sql id="Base_Column_List">
49   - ID AS id, WOMAN_ID AS womanId, TYPE AS type, YUN_NUM AS yunNum, CHAN_NUM AS chanNum, SHUN_NUM AS shunNum, PAO_NUM AS paoNum, LIU_NUM AS liuNum, ZIRAN_NUM AS ziranNum, RENGONG_NUM AS rengongNum, SITAI_NUM AS sitaiNum, SICHAN_NUM AS sichanNum, CHILDDIE_NUM AS childdieNum, BIRTHDEFECT_NUM AS birthdefectNum, HEIGHT AS height, WEIGHT AS weight, HEIGHT_AGO AS heightAgo, WEIGHT_INDEX AS weightIndex, BLOOD_SHRINK AS bloodShrink, BLOOD_DIASTOLE AS bloodDiastole, HEART AS heart, LUNG AS lung, WAIYIN_WOMAN AS waiyinWoman, YINDAO_WOMAN AS yindaoWoman, GONGJING_WOMAN AS gongjingWoman, ZIGONG_WOMAN AS zigongWoman, FUJIAN_WOMAN AS fujianWoman, GONGGAO_OBSTETRICS AS gonggaoObstetrics, FUWEI_OBSTETRICS AS fuweiObstetrics, FUZHONG_OBSTETRICS AS fuzhongObstetrics, TAISHU_OBSTETRICS AS taishuObstetrics, DISPOSE_SUGGEST AS disposeSuggest, GUIDE_SUGGEST AS guideSuggest, NEXTINSPECT_NUM AS nextinspectNum, NEXTINSPECT_TIME AS nextinspectTime, DOCTOR_ID AS doctorId, ORG_ID AS orgId, DIAGNOSE_TIME AS diagnoseTime
50   - </sql>
  46 + <!-- 补充字段 by xujiahong since 2017-04-26 -->
  47 + <result column="PERSON_ID" property="personId" />
  48 + <result column="HAS_HIGHRISK" property="hasHighrisk" />
  49 + <result column="CUS_HR_COLORCODE" property="cusHrColorcode" />
  50 + <result column="CUS_HR_COLORTEXT" property="cusHrColortext" />
  51 + <result column="CUS_HR_NAME" property="cusHrName" />
  52 + <result column="CUS_HR_GRADE" property="cusHrGrade" />
  53 + <result column="HAS_DIAGNOSE" property="hasDiagnose" />
  54 + </resultMap>
  55 +
  56 + <!-- 通用查询结果列 -->
  57 + <sql id="Base_Column_List">
  58 + ID AS id, WOMAN_ID AS womanId, TYPE AS type, YUN_NUM AS
  59 + yunNum, CHAN_NUM
  60 + AS chanNum, SHUN_NUM AS shunNum, PAO_NUM AS paoNum,
  61 + LIU_NUM AS liuNum,
  62 + ZIRAN_NUM AS ziranNum, RENGONG_NUM AS rengongNum,
  63 + SITAI_NUM AS
  64 + sitaiNum, SICHAN_NUM AS sichanNum, CHILDDIE_NUM AS
  65 + childdieNum,
  66 + BIRTHDEFECT_NUM AS birthdefectNum, HEIGHT AS height,
  67 + WEIGHT AS weight,
  68 + WEIGHT_AGO AS weightAgo, WEIGHT_INDEX AS weightIndex,
  69 + BLOOD_SHRINK AS
  70 + bloodShrink, BLOOD_DIASTOLE AS bloodDiastole, HEART AS
  71 + heart, LUNG AS
  72 + lung, WAIYIN_WOMAN AS waiyinWoman, YINDAO_WOMAN AS
  73 + yindaoWoman,
  74 + GONGJING_WOMAN AS gongjingWoman, ZIGONG_WOMAN AS
  75 + zigongWoman,
  76 + FUJIAN_WOMAN AS fujianWoman, GONGGAO_OBSTETRICS AS
  77 + gonggaoObstetrics,
  78 + FUWEI_OBSTETRICS AS fuweiObstetrics,
  79 + FUZHONG_OBSTETRICS AS
  80 + fuzhongObstetrics, TAISHU_OBSTETRICS AS
  81 + taishuObstetrics,
  82 + DISPOSE_SUGGEST AS disposeSuggest, GUIDE_SUGGEST AS
  83 + guideSuggest,
  84 + NEXTINSPECT_NUM AS nextinspectNum, NEXTINSPECT_TIME AS
  85 + nextinspectTime, DOCTOR_ID AS doctorId, ORG_ID AS orgId, DIAGNOSE_TIME
  86 + AS diagnoseTime,PERSON_ID AS personId, HAS_HIGHRISK AS hasHighrisk,
  87 + CUS_HR_COLORCODE AS
  88 + cusHrColorcode,CUS_HR_COLORTEXT AS cusHrColortext,
  89 + CUS_HR_NAME AS cusHrName,CUS_HR_GRADE AS
  90 + cusHrGrade,HAS_DIAGNOSE AS
  91 + hasDiagnose
  92 + </sql>
  93 +
  94 +
  95 + <select id="getLastHighrisk" resultType="HighriskConf">
  96 + select c.* from (
  97 + select m.* from DIAGNOSE_MAPS m where m.DIAGNOSE_ID in (
  98 + select id from (
  99 + select * from DIAGNOSE_INFO d where d.person_id = #{personId} and d.HAS_HIGHRISK = 1 ORDER BY d.DIAGNOSE_TIME desc limit 0,1
  100 + ) as t
  101 + )
  102 + ) m left join HIGHRISK_CONF c on m.SOURCE_ID = c.id
  103 + union all
  104 + select * from (
  105 + select null as ID,'other' as source_ID , null as VERSION_ID,cus_hr_name as name,CUS_HR_COLORCODE as colorcode,CUS_HR_COLORTEXT as colortext ,999 as grouporder,999 as itemorder,dd.cus_hr_grade as grade,1 as enable from DIAGNOSE_INFO dd where dd.person_id = #{personId} and dd.HAS_HIGHRISK = 1 ORDER BY dd.DIAGNOSE_TIME desc limit 0,1
  106 + ) as tt
  107 + </select>
51 108 </mapper>
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java View file @ bea667a
Diff suppressed. Click to show
... ... @@ -18,502 +18,598 @@
18 18 @TableName("DIAGNOSE_INFO")
19 19 public class DiagnoseInfo implements Serializable {
20 20  
21   - private static final long serialVersionUID = 1L;
  21 + private static final long serialVersionUID = 1L;
22 22  
23   - /**
24   - *
25   - */
26   - @TableId(value = "ID")
27   - private String id;
28   - /**
29   - *
30   - */
31   - @TableField(value = "WOMAN_ID")
32   - private String womanId;
33   - /**
34   - * 诊断类型，0为初诊，1为复诊
35   - */
36   - @TableField(value = "TYPE")
37   - private Integer type;
38   - /**
39   - * 孕次
40   - */
41   - @TableField(value = "YUN_NUM")
42   - private Integer yunNum;
43   - /**
44   - * 产次
45   - */
46   - @TableField(value = "CHAN_NUM")
47   - private Integer chanNum;
48   - /**
49   - * 顺产
50   - */
51   - @TableField(value = "SHUN_NUM")
52   - private Integer shunNum;
53   - /**
54   - * 刨宫产
55   - */
56   - @TableField(value = "PAO_NUM")
57   - private Integer paoNum;
58   - /**
59   - * 流产
60   - */
61   - @TableField(value = "LIU_NUM")
62   - private Integer liuNum;
63   - /**
64   - * 自然
65   - */
66   - @TableField(value = "ZIRAN_NUM")
67   - private Integer ziranNum;
68   - /**
69   - * 人工
70   - */
71   - @TableField(value = "RENGONG_NUM")
72   - private Integer rengongNum;
73   - /**
74   - * 死胎
75   - */
76   - @TableField(value = "SITAI_NUM")
77   - private Integer sitaiNum;
78   - /**
79   - * 死产
80   - */
81   - @TableField(value = "SICHAN_NUM")
82   - private Integer sichanNum;
83   - /**
84   - * 新生儿死亡
85   - */
86   - @TableField(value = "CHILDDIE_NUM")
87   - private Integer childdieNum;
88   - /**
89   - * 出生缺陷儿
90   - */
91   - @TableField(value = "BIRTHDEFECT_NUM")
92   - private Integer birthdefectNum;
93   - /**
94   - * 身高
95   - */
96   - @TableField(value = "HEIGHT")
97   - private Integer height;
98   - /**
99   - * 体重
100   - */
101   - @TableField(value = "WEIGHT")
102   - private Integer weight;
103   - /**
104   - * 孕前体重
105   - */
106   - @TableField(value = "HEIGHT_AGO")
107   - private Integer heightAgo;
108   - /**
109   - * 体重指数
110   - */
111   - @TableField(value = "WEIGHT_INDEX")
112   - private Double weightIndex;
113   - /**
114   - * 血压_收缩压
115   - */
116   - @TableField(value = "BLOOD_SHRINK")
117   - private Integer bloodShrink;
118   - /**
119   - * 血压_舒张压
120   - */
121   - @TableField(value = "BLOOD_DIASTOLE")
122   - private Integer bloodDiastole;
123   - /**
124   - * 心脏
125   - */
126   - @TableField(value = "HEART")
127   - private String heart;
128   - /**
129   - * 肺部
130   - */
131   - @TableField(value = "LUNG")
132   - private String lung;
133   - /**
134   - * 外阴
135   - */
136   - @TableField(value = "WAIYIN_WOMAN")
137   - private String waiyinWoman;
138   - /**
139   - * 阴道
140   - */
141   - @TableField(value = "YINDAO_WOMAN")
142   - private String yindaoWoman;
143   - /**
144   - *
145   - */
146   - @TableField(value = "GONGJING_WOMAN")
147   - private String gongjingWoman;
148   - /**
149   - * 子宫
150   - */
151   - @TableField(value = "ZIGONG_WOMAN")
152   - private String zigongWoman;
153   - /**
154   - * 附件
155   - */
156   - @TableField(value = "FUJIAN_WOMAN")
157   - private String fujianWoman;
158   - /**
159   - * 宫高
160   - */
161   - @TableField(value = "GONGGAO_OBSTETRICS")
162   - private Integer gonggaoObstetrics;
163   - /**
164   - * 腹围
165   - */
166   - @TableField(value = "FUWEI_OBSTETRICS")
167   - private Integer fuweiObstetrics;
168   - /**
169   - * 浮肿
170   - */
171   - @TableField(value = "FUZHONG_OBSTETRICS")
172   - private Integer fuzhongObstetrics;
173   - /**
174   - * 胎数
175   - */
176   - @TableField(value = "TAISHU_OBSTETRICS")
177   - private Integer taishuObstetrics;
178   - /**
179   - * 处理意见
180   - */
181   - @TableField(value = "DISPOSE_SUGGEST")
182   - private String disposeSuggest;
183   - /**
184   - * 指导意见
185   - */
186   - @TableField(value = "GUIDE_SUGGEST")
187   - private String guideSuggest;
188   - /**
189   - * 下次产检孕周数
190   - */
191   - @TableField(value = "NEXTINSPECT_NUM")
192   - private Integer nextinspectNum;
193   - /**
194   - * 下次检查日期
195   - */
196   - @TableField(value = "NEXTINSPECT_TIME")
197   - private Date nextinspectTime;
198   - /**
199   - *
200   - */
201   - @TableField(value = "DOCTOR_ID")
202   - private String doctorId;
203   - /**
204   - * 医院id
205   - */
206   - @TableField(value = "ORG_ID")
207   - private String orgId;
208   - /**
209   - * 诊断时间
210   - */
211   - @TableField(value = "DIAGNOSE_TIME")
212   - private Date diagnoseTime;
  23 + /**
  24 + *
  25 + */
  26 + @TableId(value = "ID")
  27 + private String id;
  28 + /**
  29 + *
  30 + */
  31 + @TableField(value = "WOMAN_ID")
  32 + private String womanId;
  33 + /**
  34 + * 诊断类型，0为初诊，1为复诊
  35 + */
  36 + @TableField(value = "TYPE")
  37 + private Integer type;
  38 + /**
  39 + * 孕次
  40 + */
  41 + @TableField(value = "YUN_NUM")
  42 + private Integer yunNum;
  43 + /**
  44 + * 产次
  45 + */
  46 + @TableField(value = "CHAN_NUM")
  47 + private Integer chanNum;
  48 + /**
  49 + * 顺产
  50 + */
  51 + @TableField(value = "SHUN_NUM")
  52 + private Integer shunNum;
  53 + /**
  54 + * 刨宫产
  55 + */
  56 + @TableField(value = "PAO_NUM")
  57 + private Integer paoNum;
  58 + /**
  59 + * 流产
  60 + */
  61 + @TableField(value = "LIU_NUM")
  62 + private Integer liuNum;
  63 + /**
  64 + * 自然
  65 + */
  66 + @TableField(value = "ZIRAN_NUM")
  67 + private Integer ziranNum;
  68 + /**
  69 + * 人工
  70 + */
  71 + @TableField(value = "RENGONG_NUM")
  72 + private Integer rengongNum;
  73 + /**
  74 + * 死胎
  75 + */
  76 + @TableField(value = "SITAI_NUM")
  77 + private Integer sitaiNum;
  78 + /**
  79 + * 死产
  80 + */
  81 + @TableField(value = "SICHAN_NUM")
  82 + private Integer sichanNum;
  83 + /**
  84 + * 新生儿死亡
  85 + */
  86 + @TableField(value = "CHILDDIE_NUM")
  87 + private Integer childdieNum;
  88 + /**
  89 + * 出生缺陷儿
  90 + */
  91 + @TableField(value = "BIRTHDEFECT_NUM")
  92 + private Integer birthdefectNum;
  93 + /**
  94 + * 身高
  95 + */
  96 + @TableField(value = "HEIGHT")
  97 + private Integer height;
  98 + /**
  99 + * 体重
  100 + */
  101 + @TableField(value = "WEIGHT")
  102 + private Integer weight;
  103 + /**
  104 + * 孕前体重
  105 + */
  106 + @TableField(value = "WEIGHT_AGO")
  107 + private Integer weightAgo;
  108 + /**
  109 + * 体重指数
  110 + */
  111 + @TableField(value = "WEIGHT_INDEX")
  112 + private Double weightIndex;
  113 + /**
  114 + * 血压_收缩压
  115 + */
  116 + @TableField(value = "BLOOD_SHRINK")
  117 + private Integer bloodShrink;
  118 + /**
  119 + * 血压_舒张压
  120 + */
  121 + @TableField(value = "BLOOD_DIASTOLE")
  122 + private Integer bloodDiastole;
  123 + /**
  124 + * 心脏
  125 + */
  126 + @TableField(value = "HEART")
  127 + private String heart;
  128 + /**
  129 + * 肺部
  130 + */
  131 + @TableField(value = "LUNG")
  132 + private String lung;
  133 + /**
  134 + * 外阴
  135 + */
  136 + @TableField(value = "WAIYIN_WOMAN")
  137 + private String waiyinWoman;
  138 + /**
  139 + * 阴道
  140 + */
  141 + @TableField(value = "YINDAO_WOMAN")
  142 + private String yindaoWoman;
  143 + /**
  144 + *
  145 + */
  146 + @TableField(value = "GONGJING_WOMAN")
  147 + private String gongjingWoman;
  148 + /**
  149 + * 子宫
  150 + */
  151 + @TableField(value = "ZIGONG_WOMAN")
  152 + private String zigongWoman;
  153 + /**
  154 + * 附件
  155 + */
  156 + @TableField(value = "FUJIAN_WOMAN")
  157 + private String fujianWoman;
  158 + /**
  159 + * 宫高
  160 + */
  161 + @TableField(value = "GONGGAO_OBSTETRICS")
  162 + private Integer gonggaoObstetrics;
  163 + /**
  164 + * 腹围
  165 + */
  166 + @TableField(value = "FUWEI_OBSTETRICS")
  167 + private Integer fuweiObstetrics;
  168 + /**
  169 + * 浮肿
  170 + */
  171 + @TableField(value = "FUZHONG_OBSTETRICS")
  172 + private Integer fuzhongObstetrics;
  173 + /**
  174 + * 胎数
  175 + */
  176 + @TableField(value = "TAISHU_OBSTETRICS")
  177 + private Integer taishuObstetrics;
  178 + /**
  179 + * 处理意见
  180 + */
  181 + @TableField(value = "DISPOSE_SUGGEST")
  182 + private String disposeSuggest;
  183 + /**
  184 + * 指导意见
  185 + */
  186 + @TableField(value = "GUIDE_SUGGEST")
  187 + private String guideSuggest;
  188 + /**
  189 + * 下次产检孕周数
  190 + */
  191 + @TableField(value = "NEXTINSPECT_NUM")
  192 + private Integer nextinspectNum;
  193 + /**
  194 + * 下次检查日期
  195 + */
  196 + @TableField(value = "NEXTINSPECT_TIME")
  197 + private Date nextinspectTime;
  198 + /**
  199 + *
  200 + */
  201 + @TableField(value = "DOCTOR_ID")
  202 + private String doctorId;
  203 + /**
  204 + * 医院id
  205 + */
  206 + @TableField(value = "ORG_ID")
  207 + private String orgId;
  208 + /**
  209 + * 诊断时间
  210 + */
  211 + @TableField(value = "DIAGNOSE_TIME")
  212 + private Date diagnoseTime;
  213 +
  214 + //补充字段 by xujiahong since 2017-04-26======================================
  215 +
  216 + /**
  217 + * 居民表ID
  218 + */
  219 + @TableField(value = "PERSON_ID")
  220 + private String personId;
  221 + /**
  222 + * 是否存在高危定义，1有，0没有
  223 + */
  224 + @TableField(value = "HAS_HIGHRISK")
  225 + private Integer hasHighrisk;
  226 + /**
  227 + * 其他用户自定义高危颜色编码
  228 + */
  229 + @TableField(value = "CUS_HR_COLORCODE")
  230 + private String cusHrColorcode;
  231 + /**
  232 + * 其他用户自定义高危颜色描述
  233 + */
  234 + @TableField(value = "CUS_HR_COLORTEXT")
  235 + private String cusHrColortext;
  236 + /**
  237 + * 其他用户自定义高危描述
  238 + */
  239 + @TableField(value = "CUS_HR_NAME")
  240 + private String cusHrName;
  241 + /**
  242 + * 其他用户自定义高危评分
  243 + */
  244 + @TableField(value = "CUS_HR_GRADE")
  245 + private Integer cusHrGrade;
  246 + /**
  247 + * 是否存在诊断定义，1有，0没有
  248 + */
  249 + @TableField(value = "HAS_DIAGNOSE")
  250 + private Integer hasDiagnose;
  251 +
213 252  
214   - public String getId() {
215   - return id;
216   - }
  253 + public String getId() {
  254 + return id;
  255 + }
217 256  
218   - public void setId(String id) {
219   - this.id = id;
220   - }
  257 + public void setId(String id) {
  258 + this.id = id;
  259 + }
221 260  
222   - public String getWomanId() {
223   - return womanId;
224   - }
  261 + public String getWomanId() {
  262 + return womanId;
  263 + }
225 264  
226   - public void setWomanId(String womanId) {
227   - this.womanId = womanId;
228   - }
  265 + public void setWomanId(String womanId) {
  266 + this.womanId = womanId;
  267 + }
229 268  
230   - public Integer getType() {
231   - return type;
232   - }
  269 + public Integer getType() {
  270 + return type;
  271 + }
233 272  
234   - public void setType(Integer type) {
235   - this.type = type;
236   - }
  273 + public void setType(Integer type) {
  274 + this.type = type;
  275 + }
237 276  
238   - public Integer getYunNum() {
239   - return yunNum;
240   - }
  277 + public Integer getYunNum() {
  278 + return yunNum;
  279 + }
241 280  
242   - public void setYunNum(Integer yunNum) {
243   - this.yunNum = yunNum;
244   - }
  281 + public void setYunNum(Integer yunNum) {
  282 + this.yunNum = yunNum;
  283 + }
245 284  
246   - public Integer getChanNum() {
247   - return chanNum;
248   - }
  285 + public Integer getChanNum() {
  286 + return chanNum;
  287 + }
249 288  
250   - public void setChanNum(Integer chanNum) {
251   - this.chanNum = chanNum;
252   - }
  289 + public void setChanNum(Integer chanNum) {
  290 + this.chanNum = chanNum;
  291 + }
253 292  
254   - public Integer getShunNum() {
255   - return shunNum;
256   - }
  293 + public Integer getShunNum() {
  294 + return shunNum;
  295 + }
257 296  
258   - public void setShunNum(Integer shunNum) {
259   - this.shunNum = shunNum;
260   - }
  297 + public void setShunNum(Integer shunNum) {
  298 + this.shunNum = shunNum;
  299 + }
261 300  
262   - public Integer getPaoNum() {
263   - return paoNum;
264   - }
  301 + public Integer getPaoNum() {
  302 + return paoNum;
  303 + }
265 304  
266   - public void setPaoNum(Integer paoNum) {
267   - this.paoNum = paoNum;
268   - }
  305 + public void setPaoNum(Integer paoNum) {
  306 + this.paoNum = paoNum;
  307 + }
269 308  
270   - public Integer getLiuNum() {
271   - return liuNum;
272   - }
  309 + public Integer getLiuNum() {
  310 + return liuNum;
  311 + }
273 312  
274   - public void setLiuNum(Integer liuNum) {
275   - this.liuNum = liuNum;
276   - }
  313 + public void setLiuNum(Integer liuNum) {
  314 + this.liuNum = liuNum;
  315 + }
277 316  
278   - public Integer getZiranNum() {
279   - return ziranNum;
280   - }
  317 + public Integer getZiranNum() {
  318 + return ziranNum;
  319 + }
281 320  
282   - public void setZiranNum(Integer ziranNum) {
283   - this.ziranNum = ziranNum;
284   - }
  321 + public void setZiranNum(Integer ziranNum) {
  322 + this.ziranNum = ziranNum;
  323 + }
285 324  
286   - public Integer getRengongNum() {
287   - return rengongNum;
288   - }
  325 + public Integer getRengongNum() {
  326 + return rengongNum;
  327 + }
289 328  
290   - public void setRengongNum(Integer rengongNum) {
291   - this.rengongNum = rengongNum;
292   - }
  329 + public void setRengongNum(Integer rengongNum) {
  330 + this.rengongNum = rengongNum;
  331 + }
293 332  
294   - public Integer getSitaiNum() {
295   - return sitaiNum;
296   - }
  333 + public Integer getSitaiNum() {
  334 + return sitaiNum;
  335 + }
297 336  
298   - public void setSitaiNum(Integer sitaiNum) {
299   - this.sitaiNum = sitaiNum;
300   - }
  337 + public void setSitaiNum(Integer sitaiNum) {
  338 + this.sitaiNum = sitaiNum;
  339 + }
301 340  
302   - public Integer getSichanNum() {
303   - return sichanNum;
304   - }
  341 + public Integer getSichanNum() {
  342 + return sichanNum;
  343 + }
305 344  
306   - public void setSichanNum(Integer sichanNum) {
307   - this.sichanNum = sichanNum;
308   - }
  345 + public void setSichanNum(Integer sichanNum) {
  346 + this.sichanNum = sichanNum;
  347 + }
309 348  
310   - public Integer getChilddieNum() {
311   - return childdieNum;
312   - }
  349 + public Integer getChilddieNum() {
  350 + return childdieNum;
  351 + }
313 352  
314   - public void setChilddieNum(Integer childdieNum) {
315   - this.childdieNum = childdieNum;
316   - }
  353 + public void setChilddieNum(Integer childdieNum) {
  354 + this.childdieNum = childdieNum;
  355 + }
317 356  
318   - public Integer getBirthdefectNum() {
319   - return birthdefectNum;
320   - }
  357 + public Integer getBirthdefectNum() {
  358 + return birthdefectNum;
  359 + }
321 360  
322   - public void setBirthdefectNum(Integer birthdefectNum) {
323   - this.birthdefectNum = birthdefectNum;
324   - }
  361 + public void setBirthdefectNum(Integer birthdefectNum) {
  362 + this.birthdefectNum = birthdefectNum;
  363 + }
325 364  
326   - public Integer getHeight() {
327   - return height;
328   - }
  365 + public Integer getHeight() {
  366 + return height;
  367 + }
329 368  
330   - public void setHeight(Integer height) {
331   - this.height = height;
332   - }
  369 + public void setHeight(Integer height) {
  370 + this.height = height;
  371 + }
333 372  
334   - public Integer getWeight() {
335   - return weight;
336   - }
  373 + public Integer getWeight() {
  374 + return weight;
  375 + }
337 376  
338   - public void setWeight(Integer weight) {
339   - this.weight = weight;
340   - }
  377 + public void setWeight(Integer weight) {
  378 + this.weight = weight;
  379 + }
  380 +
  381 + public Integer getWeightAgo() {
  382 + return weightAgo;
  383 + }
341 384  
342   - public Integer getHeightAgo() {
343   - return heightAgo;
344   - }
  385 + public void setWeightAgo(Integer weightAgo) {
  386 + this.weightAgo = weightAgo;
  387 + }
345 388  
346   - public void setHeightAgo(Integer heightAgo) {
347   - this.heightAgo = heightAgo;
348   - }
  389 + public Double getWeightIndex() {
  390 + return weightIndex;
  391 + }
349 392  
350   - public Double getWeightIndex() {
351   - return weightIndex;
352   - }
  393 + public void setWeightIndex(Double weightIndex) {
  394 + this.weightIndex = weightIndex;
  395 + }
353 396  
354   - public void setWeightIndex(Double weightIndex) {
355   - this.weightIndex = weightIndex;
356   - }
  397 + public Integer getBloodShrink() {
  398 + return bloodShrink;
  399 + }
357 400  
358   - public Integer getBloodShrink() {
359   - return bloodShrink;
360   - }
  401 + public void setBloodShrink(Integer bloodShrink) {
  402 + this.bloodShrink = bloodShrink;
  403 + }
361 404  
362   - public void setBloodShrink(Integer bloodShrink) {
363   - this.bloodShrink = bloodShrink;
364   - }
  405 + public Integer getBloodDiastole() {
  406 + return bloodDiastole;
  407 + }
365 408  
366   - public Integer getBloodDiastole() {
367   - return bloodDiastole;
368   - }
  409 + public void setBloodDiastole(Integer bloodDiastole) {
  410 + this.bloodDiastole = bloodDiastole;
  411 + }
369 412  
370   - public void setBloodDiastole(Integer bloodDiastole) {
371   - this.bloodDiastole = bloodDiastole;
372   - }
  413 + public String getHeart() {
  414 + return heart;
  415 + }
373 416  
374   - public String getHeart() {
375   - return heart;
376   - }
  417 + public void setHeart(String heart) {
  418 + this.heart = heart;
  419 + }
377 420  
378   - public void setHeart(String heart) {
379   - this.heart = heart;
380   - }
  421 + public String getLung() {
  422 + return lung;
  423 + }
381 424  
382   - public String getLung() {
383   - return lung;
384   - }
  425 + public void setLung(String lung) {
  426 + this.lung = lung;
  427 + }
385 428  
386   - public void setLung(String lung) {
387   - this.lung = lung;
388   - }
  429 + public String getWaiyinWoman() {
  430 + return waiyinWoman;
  431 + }
389 432  
390   - public String getWaiyinWoman() {
391   - return waiyinWoman;
392   - }
  433 + public void setWaiyinWoman(String waiyinWoman) {
  434 + this.waiyinWoman = waiyinWoman;
  435 + }
393 436  
394   - public void setWaiyinWoman(String waiyinWoman) {
395   - this.waiyinWoman = waiyinWoman;
396   - }
  437 + public String getYindaoWoman() {
  438 + return yindaoWoman;
  439 + }
397 440  
398   - public String getYindaoWoman() {
399   - return yindaoWoman;
400   - }
  441 + public void setYindaoWoman(String yindaoWoman) {
  442 + this.yindaoWoman = yindaoWoman;
  443 + }
401 444  
402   - public void setYindaoWoman(String yindaoWoman) {
403   - this.yindaoWoman = yindaoWoman;
404   - }
  445 + public String getGongjingWoman() {
  446 + return gongjingWoman;
  447 + }
405 448  
406   - public String getGongjingWoman() {
407   - return gongjingWoman;
408   - }
  449 + public void setGongjingWoman(String gongjingWoman) {
  450 + this.gongjingWoman = gongjingWoman;
  451 + }
409 452  
410   - public void setGongjingWoman(String gongjingWoman) {
411   - this.gongjingWoman = gongjingWoman;
412   - }
  453 + public String getZigongWoman() {
  454 + return zigongWoman;
  455 + }
413 456  
414   - public String getZigongWoman() {
415   - return zigongWoman;
416   - }
  457 + public void setZigongWoman(String zigongWoman) {
  458 + this.zigongWoman = zigongWoman;
  459 + }
417 460  
418   - public void setZigongWoman(String zigongWoman) {
419   - this.zigongWoman = zigongWoman;
420   - }
  461 + public String getFujianWoman() {
  462 + return fujianWoman;
  463 + }
421 464  
422   - public String getFujianWoman() {
423   - return fujianWoman;
424   - }
  465 + public void setFujianWoman(String fujianWoman) {
  466 + this.fujianWoman = fujianWoman;
  467 + }
425 468  
426   - public void setFujianWoman(String fujianWoman) {
427   - this.fujianWoman = fujianWoman;
428   - }
  469 + public Integer getGonggaoObstetrics() {
  470 + return gonggaoObstetrics;
  471 + }
429 472  
430   - public Integer getGonggaoObstetrics() {
431   - return gonggaoObstetrics;
432   - }
  473 + public void setGonggaoObstetrics(Integer gonggaoObstetrics) {
  474 + this.gonggaoObstetrics = gonggaoObstetrics;
  475 + }
433 476  
434   - public void setGonggaoObstetrics(Integer gonggaoObstetrics) {
435   - this.gonggaoObstetrics = gonggaoObstetrics;
436   - }
  477 + public Integer getFuweiObstetrics() {
  478 + return fuweiObstetrics;
  479 + }
437 480  
438   - public Integer getFuweiObstetrics() {
439   - return fuweiObstetrics;
440   - }
  481 + public void setFuweiObstetrics(Integer fuweiObstetrics) {
  482 + this.fuweiObstetrics = fuweiObstetrics;
  483 + }
441 484  
442   - public void setFuweiObstetrics(Integer fuweiObstetrics) {
443   - this.fuweiObstetrics = fuweiObstetrics;
444   - }
  485 + public Integer getFuzhongObstetrics() {
  486 + return fuzhongObstetrics;
  487 + }
445 488  
446   - public Integer getFuzhongObstetrics() {
447   - return fuzhongObstetrics;
448   - }
  489 + public void setFuzhongObstetrics(Integer fuzhongObstetrics) {
  490 + this.fuzhongObstetrics = fuzhongObstetrics;
  491 + }
449 492  
450   - public void setFuzhongObstetrics(Integer fuzhongObstetrics) {
451   - this.fuzhongObstetrics = fuzhongObstetrics;
452   - }
  493 + public Integer getTaishuObstetrics() {
  494 + return taishuObstetrics;
  495 + }
453 496  
454   - public Integer getTaishuObstetrics() {
455   - return taishuObstetrics;
456   - }
  497 + public void setTaishuObstetrics(Integer taishuObstetrics) {
  498 + this.taishuObstetrics = taishuObstetrics;
  499 + }
457 500  
458   - public void setTaishuObstetrics(Integer taishuObstetrics) {
459   - this.taishuObstetrics = taishuObstetrics;
460   - }
  501 + public String getDisposeSuggest() {
  502 + return disposeSuggest;
  503 + }
461 504  
462   - public String getDisposeSuggest() {
463   - return disposeSuggest;
464   - }
  505 + public void setDisposeSuggest(String disposeSuggest) {
  506 + this.disposeSuggest = disposeSuggest;
  507 + }
465 508  
466   - public void setDisposeSuggest(String disposeSuggest) {
467   - this.disposeSuggest = disposeSuggest;
468   - }
  509 + public String getGuideSuggest() {
  510 + return guideSuggest;
  511 + }
469 512  
470   - public String getGuideSuggest() {
471   - return guideSuggest;
472   - }
  513 + public void setGuideSuggest(String guideSuggest) {
  514 + this.guideSuggest = guideSuggest;
  515 + }
473 516  
474   - public void setGuideSuggest(String guideSuggest) {
475   - this.guideSuggest = guideSuggest;
476   - }
  517 + public Integer getNextinspectNum() {
  518 + return nextinspectNum;
  519 + }
477 520  
478   - public Integer getNextinspectNum() {
479   - return nextinspectNum;
480   - }
  521 + public void setNextinspectNum(Integer nextinspectNum) {
  522 + this.nextinspectNum = nextinspectNum;
  523 + }
481 524  
482   - public void setNextinspectNum(Integer nextinspectNum) {
483   - this.nextinspectNum = nextinspectNum;
484   - }
  525 + public Date getNextinspectTime() {
  526 + return nextinspectTime;
  527 + }
485 528  
486   - public Date getNextinspectTime() {
487   - return nextinspectTime;
488   - }
  529 + public void setNextinspectTime(Date nextinspectTime) {
  530 + this.nextinspectTime = nextinspectTime;
  531 + }
489 532  
490   - public void setNextinspectTime(Date nextinspectTime) {
491   - this.nextinspectTime = nextinspectTime;
492   - }
  533 + public String getDoctorId() {
  534 + return doctorId;
  535 + }
493 536  
494   - public String getDoctorId() {
495   - return doctorId;
496   - }
  537 + public void setDoctorId(String doctorId) {
  538 + this.doctorId = doctorId;
  539 + }
497 540  
498   - public void setDoctorId(String doctorId) {
499   - this.doctorId = doctorId;
500   - }
  541 + public String getOrgId() {
  542 + return orgId;
  543 + }
501 544  
502   - public String getOrgId() {
503   - return orgId;
504   - }
  545 + public void setOrgId(String orgId) {
  546 + this.orgId = orgId;
  547 + }
505 548  
506   - public void setOrgId(String orgId) {
507   - this.orgId = orgId;
508   - }
  549 + public Date getDiagnoseTime() {
  550 + return diagnoseTime;
  551 + }
509 552  
510   - public Date getDiagnoseTime() {
511   - return diagnoseTime;
512   - }
  553 + public void setDiagnoseTime(Date diagnoseTime) {
  554 + this.diagnoseTime = diagnoseTime;
  555 + }
513 556  
514   - public void setDiagnoseTime(Date diagnoseTime) {
515   - this.diagnoseTime = diagnoseTime;
516   - }
  557 + public String getPersonId() {
  558 + return personId;
  559 + }
  560 +
  561 + public void setPersonId(String personId) {
  562 + this.personId = personId;
  563 + }
  564 +
  565 + public Integer getHasHighrisk() {
  566 + return hasHighrisk;
  567 + }
  568 +
  569 + public void setHasHighrisk(Integer hasHighrisk) {
  570 + this.hasHighrisk = hasHighrisk;
  571 + }
  572 +
  573 + public String getCusHrColorcode() {
  574 + return cusHrColorcode;
  575 + }
  576 +
  577 + public void setCusHrColorcode(String cusHrColorcode) {
  578 + this.cusHrColorcode = cusHrColorcode;
  579 + }
  580 +
  581 + public String getCusHrColortext() {
  582 + return cusHrColortext;
  583 + }
  584 +
  585 + public void setCusHrColortext(String cusHrColortext) {
  586 + this.cusHrColortext = cusHrColortext;
  587 + }
  588 +
  589 + public String getCusHrName() {
  590 + return cusHrName;
  591 + }
  592 +
  593 + public void setCusHrName(String cusHrName) {
  594 + this.cusHrName = cusHrName;
  595 + }
  596 +
  597 + public Integer getCusHrGrade() {
  598 + return cusHrGrade;
  599 + }
  600 +
  601 + public void setCusHrGrade(Integer cusHrGrade) {
  602 + this.cusHrGrade = cusHrGrade;
  603 + }
  604 +
  605 + public Integer getHasDiagnose() {
  606 + return hasDiagnose;
  607 + }
  608 +
  609 + public void setHasDiagnose(Integer hasDiagnose) {
  610 + this.hasDiagnose = hasDiagnose;
  611 + }
  612 +
517 613  
518 614 }
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java View file @ bea667a
... ... @@ -3,6 +3,8 @@
3 3 import com.baomidou.mybatisplus.annotations.TableId;
4 4 import com.baomidou.mybatisplus.annotations.TableField;
5 5 import com.baomidou.mybatisplus.annotations.TableName;
  6 +import com.lyms.util.DateUtil;
  7 +
6 8 import java.io.Serializable;
7 9 import java.util.Date;
8 10  
... ... @@ -292,7 +294,24 @@
292 294 @TableField(value="SOURCE_ID")
293 295 private String sourceId;
294 296  
295   - //格式化字段
  297 + /**
  298 + * 分娩日期
  299 + */
  300 + @TableField(value="FM_DATE")
  301 + private Date fmDate;
  302 + /**
  303 + * 是否自动分娩，0不是，1是
  304 + */
  305 + @TableField(value="IFAUTOFM")
  306 + private Integer ifautofm;
  307 +
  308 + /**
  309 + * 孕妇状态，1孕妇，3产妇
  310 + */
  311 + @TableField(value="STATE")
  312 + private Integer state;
  313 +
  314 + //格式化字段（5各自段已格式化）
296 315 @TableField(exist=false)
297 316 private String baseWomanBirthStr;//孕妇生日Str
298 317 @TableField(exist=false)
... ... @@ -697,6 +716,7 @@
697 716  
698 717 public void setBaseWomanBirth(Date baseWomanBirth) {
699 718 this.baseWomanBirth = baseWomanBirth;
  719 + this.baseWomanBirthStr = DateUtil.getyyyy_MM_dd(baseWomanBirth);
700 720 }
701 721 public Date getHospitalLastMenstruation() {
702 722 return hospitalLastMenstruation;
... ... @@ -704,6 +724,7 @@
704 724  
705 725 public void setHospitalLastMenstruation(Date hospitalLastMenstruation) {
706 726 this.hospitalLastMenstruation = hospitalLastMenstruation;
  727 + this.hospitalLastMenstruationStr = DateUtil.getyyyy_MM_dd(hospitalLastMenstruation);
707 728 }
708 729  
709 730 public Date getHospitalCorrectLastMenstruation() {
... ... @@ -712,6 +733,7 @@
712 733  
713 734 public void setHospitalCorrectLastMenstruation(Date hospitalCorrectLastMenstruation) {
714 735 this.hospitalCorrectLastMenstruation = hospitalCorrectLastMenstruation;
  736 + this.hospitalCorrectLastMenstruationStr = DateUtil.getyyyy_MM_dd(hospitalCorrectLastMenstruation);
715 737 }
716 738  
717 739 public Date getHospitalExpectedDate() {
718 740  
... ... @@ -720,12 +742,14 @@
720 742  
721 743 public void setHospitalExpectedDate(Date hospitalExpectedDate) {
722 744 this.hospitalExpectedDate = hospitalExpectedDate;
  745 + this.hospitalExpectedDateStr = DateUtil.getyyyy_MM_dd(hospitalExpectedDate);
723 746 }
724 747 public Date getHospitalRecordDate() {
725 748 return hospitalRecordDate;
726 749 }
727 750 public void setHospitalRecordDate(Date hospitalRecordDate) {
728 751 this.hospitalRecordDate = hospitalRecordDate;
  752 + this.hospitalRecordDateStr = DateUtil.getyyyy_MM_dd(hospitalRecordDate);
729 753 }
730 754  
731 755 public String getBaseWomanBirthStr() {
... ... @@ -815,6 +839,38 @@
815 839 public void setSourceId(String sourceId) {
816 840 this.sourceId = sourceId;
817 841 }
  842 +
  843 + public Date getFmDate() {
  844 + return fmDate;
  845 + }
  846 +
  847 + public void setFmDate(Date fmDate) {
  848 + this.fmDate = fmDate;
  849 + }
  850 +
  851 + public String getPersonId() {
  852 + return personId;
  853 + }
  854 +
  855 + public void setPersonId(String personId) {
  856 + this.personId = personId;
  857 + }
  858 +
  859 + public Integer getIfautofm() {
  860 + return ifautofm;
  861 + }
  862 +
  863 + public void setIfautofm(Integer ifautofm) {
  864 + this.ifautofm = ifautofm;
  865 + }
  866 +
  867 + public Integer getState() {
  868 + return state;
  869 + }
  870 +
  871 + public void setState(Integer state) {
  872 + this.state = state;
  873 + }
818 874  
819 875  
820 876 }
parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java View file @ bea667a
1 1 package com.lyms.hospital.service.diagnose;
2 2  
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +
  6 +import com.lyms.hospital.entity.assist.DiagnoseAssit;
  7 +import com.lyms.base.common.entity.conf.HighriskConf;
3 8 import com.lyms.hospital.entity.diagnose.DiagnoseInfo;
  9 +import com.lyms.hospital.entity.history.HistoryMaps;
4 10 import com.lyms.web.service.BaseService;
5   -import java.io.Serializable;
  11 +import java.util.List;
6 12  
7 13 /**
8 14 * <p>
9 15 * 服务类
  16 + *
  17 + * 保存初诊数据
  18 + * 保存复诊数据
10 19 * </p>
11 20 *
12 21 * @author jiangjiazhi
13 22  
... ... @@ -20,6 +29,27 @@
20 29 * <li>@return 大于0修改成功，否则为失败
21 30 */
22 31 public Integer deleteLogicById(Serializable id);
  32 +
  33 + /**
  34 + * <li>@Description:保存初诊数据
  35 + * <li>@return
  36 + * <li>创建人：xujiahong
  37 + * <li>创建时间：2017年4月26日
  38 + * <li>修改人：
  39 + * <li>修改时间：
  40 + */
  41 + public String saveFirstExam(DiagnoseInfo info,DiagnoseAssit assist,List<HistoryMaps> historyList);
23 42  
  43 + /**
  44 + * <li>@Description:根据居民ID获取末次高危
  45 + * <li>@param personId 居民ID
  46 + * <li>@return
  47 + * <li>创建人：方承
  48 + * <li>创建时间：2017年4月25日
  49 + * <li>修改人：
  50 + * <li>修改时间：
  51 + */
  52 + public List<HighriskConf> getLastHighrisk(Serializable personId);
  53 +
24 54 }
parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java View file @ bea667a
... ... @@ -10,97 +10,141 @@
10 10  
11 11 import com.baomidou.mybatisplus.mapper.EntityWrapper;
12 12 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
  13 +import com.lyms.base.common.entity.conf.HighriskConf;
13 14 import com.lyms.hospital.dao.diagnose.DiagnoseInfoMapper;
14 15 import com.lyms.hospital.entity.assist.DiagnoseAssit;
15 16 import com.lyms.hospital.entity.diagnose.DiagnoseInfo;
  17 +import com.lyms.hospital.entity.history.HistoryMaps;
16 18 import com.lyms.hospital.service.assist.DiagnoseAssitService;
17 19 import com.lyms.hospital.service.diagnose.DiagnoseInfoService;
18 20 import com.lyms.util.StrUtils;
19 21  
20 22 /**
21 23 * <p>
22   - * 诊断信息表，包含初诊、复诊信息 服务实现类
  24 + * 诊断信息表，包含初诊、复诊信息 服务实现类
23 25 * </p>
24 26 *
25 27 * @author jiangjiazhi
26   - * @link DiagnoseTypeEnums 初诊 复诊 分类接口
  28 + * @link DiagnoseTypeEnums 初诊 复诊 分类接口
27 29 * @since 2017-03-28
28 30 */
29 31 @Service
30   -public class DiagnoseInfoServiceImpl extends ServiceImpl<DiagnoseInfoMapper, DiagnoseInfo> implements
31   - DiagnoseInfoService {
  32 +public class DiagnoseInfoServiceImpl extends ServiceImpl<DiagnoseInfoMapper, DiagnoseInfo>
  33 + implements DiagnoseInfoService {
32 34  
33   - @Autowired
34   - private DiagnoseAssitService diagnoseAssitService;
  35 + @Autowired
  36 + private DiagnoseAssitService diagnoseAssitService;
35 37  
36   - public Integer deleteLogicById(Serializable id) {
37   - return baseMapper.deleteLogicById(id);
38   - }
  38 + public Integer deleteLogicById(Serializable id) {
  39 + return baseMapper.deleteLogicById(id);
  40 + }
39 41  
40   - @Transactional
41   - public void addOrUpdate(DiagnoseInfo dInfo, DiagnoseAssit diagnoseAssit) {
42   - if (StringUtils.isEmpty(dInfo.getId())) {
43   - dInfo.setId(StrUtils.uuid());
44   - insert(dInfo);
45   - if (StringUtils.isEmpty(diagnoseAssit.getId())) {
46   - diagnoseAssit.setId(StrUtils.uuid());
47   - }
48   - diagnoseAssit.setDiagnoseId(dInfo.getId());
49   - diagnoseAssitService.insert(diagnoseAssit);
50   - } else {
51   - updateById(dInfo);
52   - diagnoseAssitService.updateById(diagnoseAssit);
53   - }
54   - }
  42 + @Transactional
  43 + public void addOrUpdate(DiagnoseInfo dInfo, DiagnoseAssit diagnoseAssit) {
  44 + if (StringUtils.isEmpty(dInfo.getId())) {
  45 + dInfo.setId(StrUtils.uuid());
  46 + insert(dInfo);
  47 + if (StringUtils.isEmpty(diagnoseAssit.getId())) {
  48 + diagnoseAssit.setId(StrUtils.uuid());
  49 + }
  50 + diagnoseAssit.setDiagnoseId(dInfo.getId());
  51 + diagnoseAssitService.insert(diagnoseAssit);
  52 + } else {
  53 + updateById(dInfo);
  54 + diagnoseAssitService.updateById(diagnoseAssit);
  55 + }
  56 + }
55 57  
56   - /**
57   - * 根据建档记录id查询所有有效的产检记录
58   - *
59   - * <li>@param parentId 建档id
60   - * <li>@return
61   - * <li>创建人：Administrator
62   - * <li>创建时间：2017-3-31
63   - * <li>修改人：
64   - * <li>修改时间：
65   - */
66   - public List<DiagnoseInfo> findListByParentId(String parentId) {
67   - EntityWrapper<DiagnoseInfo> ew = new EntityWrapper<DiagnoseInfo>();
68   - ew.where("WOMAN_ID={0}", parentId);
69   - return selectList(ew);
70   - }
  58 + /**
  59 + * 根据建档记录id查询所有有效的产检记录
  60 + *
  61 + * <li>@param parentId 建档id
  62 + * <li>@return
  63 + * <li>创建人：Administrator
  64 + * <li>创建时间：2017-3-31
  65 + * <li>修改人：
  66 + * <li>修改时间：
  67 + */
  68 + public List<DiagnoseInfo> findListByParentId(String parentId) {
  69 + EntityWrapper<DiagnoseInfo> ew = new EntityWrapper<DiagnoseInfo>();
  70 + ew.where("WOMAN_ID={0}", parentId);
  71 + return selectList(ew);
  72 + }
71 73  
72   - /**
73   - *
74   - * 根据条件查询产检信息
75   - *
76   - * <li>@param type
77   - * <li>@param cardNum
78   - * <li>@return
79   - * <li>创建人：Administrator
80   - * <li>创建时间：2017-3-31
81   - * <li>修改人：
82   - * <li>修改时间：
83   - */
84   - public DiagnoseInfo findByCond(int type, String cardNum) {
85   - EntityWrapper<DiagnoseInfo> ew = new EntityWrapper<DiagnoseInfo>();
86   - ew.where("type={0}", type).and("BASE_PAPERS_NUMBER={0}", cardNum).orderBy("DIAGNOSE_TIME", Boolean.FALSE);
87   - return (DiagnoseInfo) selectObj(ew);
88   - }
  74 + /**
  75 + *
  76 + * 根据条件查询产检信息
  77 + *
  78 + * <li>@param type
  79 + * <li>@param cardNum
  80 + * <li>@return
  81 + * <li>创建人：Administrator
  82 + * <li>创建时间：2017-3-31
  83 + * <li>修改人：
  84 + * <li>修改时间：
  85 + */
  86 + public DiagnoseInfo findByCond(int type, String cardNum) {
  87 + EntityWrapper<DiagnoseInfo> ew = new EntityWrapper<DiagnoseInfo>();
  88 + ew.where("type={0}", type).and("BASE_PAPERS_NUMBER={0}", cardNum).orderBy("DIAGNOSE_TIME", Boolean.FALSE);
  89 + return (DiagnoseInfo) selectObj(ew);
  90 + }
89 91  
90   - /**
91   - * 查询这个人所有的产检记录
92   - *
93   - * <li>@param pid
94   - * <li>@return
95   - * <li>创建人：Administrator
96   - * <li>创建时间：2017-3-31
97   - * <li>修改人：
98   - * <li>修改时间：
99   - */
100   - public List<DiagnoseInfo> findListByPid(String pid) {
101   - EntityWrapper<DiagnoseInfo> ew = new EntityWrapper<DiagnoseInfo>();
102   - ew.where("pid={0}", pid);
103   - return selectList(ew);
  92 + /**
  93 + * 查询这个人所有的产检记录
  94 + *
  95 + * <li>@param pid
  96 + * <li>@return
  97 + * <li>创建人：Administrator
  98 + * <li>创建时间：2017-3-31
  99 + * <li>修改人：
  100 + * <li>修改时间：
  101 + */
  102 + public List<DiagnoseInfo> findListByPid(String pid) {
  103 + EntityWrapper<DiagnoseInfo> ew = new EntityWrapper<DiagnoseInfo>();
  104 + ew.where("pid={0}", pid);
  105 + return selectList(ew);
  106 + }
  107 +
  108 + @Override
  109 + @Transactional
  110 + public String saveFirstExam(DiagnoseInfo info, DiagnoseAssit assist, List<HistoryMaps> historyList) {
  111 + /*
  112 + * 基础验证
  113 + */
  114 + if (info == null || assist == null || historyList == null) {
  115 + return "参数缺失";
  116 + }
  117 +
  118 + /*
  119 + * （1）保存产检基本信息 （2）批量保存病史信息 （3）保存辅助检查信息
  120 + */
  121 +// if (StringUtils.isEmpty(info.getId())) {//新增
  122 +// info.setId(StrUtils.uuid());
  123 +// insert(info);
  124 +// if (StringUtils.isEmpty(assist.getId())) {
  125 +// assist.setId(StrUtils.uuid());
  126 +// }
  127 +// diagnoseAssit.setDiagnoseId(dInfo.getId());
  128 +// diagnoseAssitService.insert(diagnoseAssit);
  129 +// } else {//修改
  130 +// updateById(dInfo);
  131 +// diagnoseAssitService.updateById(diagnoseAssit);
  132 +// }
  133 + return null;
  134 +
  135 + /*
  136 + "familyHistory":"yes"
  137 + familyHistory xyb true;
  138 +
  139 +
  140 +
  141 + */
  142 +
  143 + }
  144 +
  145 + @Override
  146 + public List<HighriskConf> getLastHighrisk(Serializable personId) {
  147 + return baseMapper.getLastHighrisk(personId);
104 148 }
105 149 }
parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java View file @ bea667a
1 1 package com.lyms.hospital.controller.woman;
2 2  
  3 +import java.util.ArrayList;
  4 +import java.util.Date;
  5 +import java.util.HashMap;
  6 +import java.util.List;
  7 +import java.util.Map;
  8 +
3 9 import org.springframework.beans.factory.annotation.Autowired;
4 10 import org.springframework.stereotype.Controller;
5 11 import org.springframework.util.StringUtils;
  12 +import org.springframework.web.bind.annotation.RequestBody;
6 13 import org.springframework.web.bind.annotation.RequestMapping;
7 14 import org.springframework.web.bind.annotation.RequestMethod;
8 15 import org.springframework.web.bind.annotation.ResponseBody;
9 16  
10 17 import com.lyms.hospital.entity.woman.WomanFetationRecord;
  18 +import com.lyms.hospital.request.exam.ExamAddRequest;
  19 +import com.lyms.hospital.service.diagnose.DiagnoseInfoService;
11 20 import com.lyms.hospital.service.woman.WomanFetationRecordService;
  21 +import com.lyms.hospital.util.HospitalUtil;
  22 +import com.lyms.util.DateUtil;
12 23 import com.lyms.web.bean.AjaxResult;
13 24 import com.lyms.web.controller.BaseController;
14 25  
15 26 /**
16 27 * 孕妇产检 前端控制器<br>
17 28 *
18   - * 依据cardNo或vcCardNo查询孕妇产检记录
  29 + * [--]依据cardNo或vcCardNo查询孕妇产检记录
  30 + * 保存初诊数据
19 31 *
20 32 * @author xujiahong
21 33 *
... ... @@ -26,6 +38,29 @@
26 38  
27 39 @Autowired
28 40 private WomanFetationRecordService fetationService;
  41 + @Autowired
  42 + private DiagnoseInfoService infoService;
  43 +
  44 + /**
  45 + * <li>@Description:保存初诊数据
  46 + * <li>@param request
  47 + * <li>@return
  48 + * <li>创建人：xujiahong
  49 + * <li>创建时间：2017年4月26日
  50 + * <li>修改人：
  51 + * <li>修改时间：
  52 + */
  53 + @RequestMapping(value = "/antex", method = RequestMethod.POST)
  54 + @ResponseBody
  55 + public AjaxResult saveExam(@RequestBody ExamAddRequest request){
  56 + /*
  57 + * （1）保存产检基本信息
  58 + * 多个胎儿信息
  59 + * （2）批量保存病史信息
  60 + * （3）保存辅助检查信息
  61 + */
  62 + return AjaxResult.returnFail();
  63 + }
29 64  
30 65 /**
31 66 * <li>@Description:依据cardNo或vcCardNo查询孕妇产检记录
32 67  
33 68  
34 69  
... ... @@ -37,13 +72,14 @@
37 72 * <li>修改人：
38 73 * <li>修改时间：
39 74 */
40   - @RequestMapping(value = "/antexmanage", method = RequestMethod.POST)
  75 + @RequestMapping(value = "/antexmanage", method = RequestMethod.GET)
41 76 @ResponseBody
42   - public AjaxResult deletePregnant(String cardNo,String vcCardNo,String orgId){//orgId或来自token
  77 + public AjaxResult selectExamHistory(String cardNo,String vcCardNo,String orgId){//orgId或来自token
43 78 /*
44   - * （1）孕妇档案信息（通过证件号或就诊卡号查询）
  79 + * （1）孕妇档案信息（通过证件号或就诊卡号查询）-根据产检券查询 TODO
45 80 * （2）高危因素列表 TODO
46   - * （3）产检记录列表
  81 + * （3）产检记录列表 TODO
  82 + *
47 83 */
48 84 //基本验证
49 85 if(StringUtils.isEmpty(orgId)){
50 86  
... ... @@ -73,11 +109,35 @@
73 109 return AjaxResult.returnFail("未查询到孕妇建档信息");
74 110 }
75 111 //（2）高危因素列表 TODO
76   - //（3）产检记录列表 TODO （此处需要查询当前产程中本院和外院的所有产检记录）
  112 + List<Map<String,Object>> riskFactor = new ArrayList<>();
  113 + //（3）产检记录列表 TODO （此处需要查询当前产程中本院和外院的所有产检记录（包括分布建档的），之后对接方承）
  114 + List<Map<String,Object>> data = new ArrayList<>(); //data 系前端指定名称
  115 + //（4）组装返回对象
  116 + Map<String,Object> dataMap = new HashMap<>();
  117 + dataMap.put("id", dbFetationRecord.getId());
  118 + dataMap.put("pid", dbFetationRecord.getWomanPersonId());
  119 + dataMap.put("name", dbFetationRecord.getBaseWomanName());
  120 + dataMap.put("age", DateUtil.getAge(dbFetationRecord.getBaseWomanBirth()));
  121 + //根据“纠正末次月经”计算孕周
  122 + dataMap.put("dueWeek", HospitalUtil.getPregnantWeek(dbFetationRecord.getHospitalCorrectLastMenstruation()));
  123 + dataMap.put("yChanQi", dbFetationRecord.getHospitalExpectedDateStr());
  124 + dataMap.put("phone", dbFetationRecord.getContactWomanWay());
  125 + dataMap.put("riskScore", "15");// TODO 高危评分
  126 + dataMap.put("remarks", dbFetationRecord.getHospitalRecordRemark());
  127 + dataMap.put("lastMenses", dbFetationRecord.getHospitalLastMenstruationStr());
  128 + dataMap.put("buildTime", dbFetationRecord.getHospitalRecordDateStr());//建档日期
  129 + dataMap.put("lastBuildTime", dbFetationRecord.getHospitalRecordDateStr());// TODO ?
  130 + dataMap.put("birth", dbFetationRecord.getBaseWomanBirthStr());
  131 + dataMap.put("tireNumber1", "1");// TODO ?
  132 + dataMap.put("cardNo", dbFetationRecord.getBasePapersNumber());
  133 + dataMap.put("vcCardNo", dbFetationRecord.getHospitalPatientCard());
  134 + dataMap.put("isSieve", "0");//TODO?
  135 + dataMap.put("isH", "0");// TODO?
77 136  
78   -
79   -
80   - return AjaxResult.returnFail();
  137 + dataMap.put("riskFactor", riskFactor);
  138 + dataMap.put("data", data);
  139 + dataMap.put("now", DateUtil.getyyyy_MM_dd_hms(new Date()));
  140 + return AjaxResult.returnSuccess(dataMap);
81 141 }
82 142  
83 143 }
parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequest.java View file @ bea667a
  1 +package com.lyms.hospital.request.exam;
  2 +
  3 +import java.util.List;
  4 +import java.util.Map;
  5 +
  6 +import org.hibernate.validator.constraints.NotEmpty;
  7 +
  8 +import com.lyms.hospital.util.Form;
  9 +import com.lyms.hospital.util.FormParam;
  10 +
  11 +/**
  12 + *
  13 + * 产前检查初诊
  14 + *
  15 + * Created by Administrator on 2016/6/20 0020.
  16 + * import from ancient project by xujiahong on 2017-04-26 10:54:35
  17 + */
  18 +@Form
  19 +public class ExamAddRequest{
  20 + @FormParam
  21 + @NotEmpty(message = "孕妇id不能为空")
  22 + private String parentId;
  23 +
  24 + private String barCode;
  25 +
  26 + private String id;
  27 +
  28 + private String pid;
  29 + //预产期
  30 + private String dueDate;
  31 + //末次月经
  32 + private String lastMenses;
  33 +
  34 + // 既往史
  35 + private Map pastHistory ;
  36 + // 家族史
  37 + private Map familyHistory ;
  38 + //个人史
  39 + private Map personalHistory;
  40 + //疫苗接种史
  41 + private Map ymjzHistory ;
  42 + //药物过敏史
  43 + private Map ywgmHistory ;
  44 + //妇科手术史
  45 + private Map fksxHistory ;
  46 + // 叶酸服用
  47 + private Map ysfyHistory ;
  48 + //本次妊娠情况
  49 + private Map cestationInfo;
  50 + //丈夫健康情况
  51 + private Map hHealthInfo;
  52 +
  53 + //孕次
  54 + private Integer pregnancyTimes;
  55 + // 产次
  56 + private Integer prodTime;
  57 + // 顺产
  58 + private Integer delivery;
  59 + //刨宫产
  60 + private Integer planedProd;
  61 + //流产
  62 + private Integer abortion;
  63 + //死胎
  64 + private Integer stillbirth;
  65 + //死产
  66 + private Integer stillChan ;
  67 + //新生儿死亡
  68 + private Integer neoDeath;
  69 + //出生缺陷
  70 + private Integer birthDefect;
  71 + // 身高
  72 + private String height;
  73 + //体重
  74 + private String weight ;
  75 + //孕前体重
  76 + private String yqWeight ;
  77 + //体重指数
  78 + private String baricIndex;
  79 + //心脏
  80 + private String heart;
  81 + //肺部
  82 + private String lungs;
  83 + //外阴
  84 + private String vulva;
  85 + //阴道
  86 + private String vagina;
  87 + // 宫颈
  88 + private String cervical;
  89 + //子宫
  90 + private String uterus;
  91 + //附件
  92 + private String fujian;
  93 + // 宫高
  94 + private String gonggao;
  95 + //腹围
  96 + private String fuwei;
  97 + //胎数
  98 + private String tireNumber1;
  99 + //血压
  100 + private Map bp;
  101 +
  102 +
  103 + private String bg;
  104 +
  105 + private List placentas;
  106 +// //心率
  107 +// private double heartRate;
  108 +// //胎方位
  109 +// private String fetalPosition;
  110 +// //胎先露
  111 +// private String fetalPresentation;
  112 +// // 衔接
  113 +// private String join;
  114 + //高危因素
  115 + private List highrisk ;
  116 + //高危评分
  117 + private String highriskSocre;
  118 + // 其他高危
  119 + private Map otherHighRisk;
  120 + // 诊断
  121 + private List diagnosis;
  122 + //处理意见
  123 + private String treatOpinion;
  124 + //指导意见
  125 + private String guide;
  126 + //产检 医生
  127 + @NotEmpty(message = "产检医生不能为空")
  128 + private String prodDoctor;
  129 + //产检日期
  130 + private String checkTime;
  131 + //下次产检时间
  132 + private String nextCheckTime;
  133 + //前端计算出来的孕周
  134 + private String cDueWeek;
  135 +
  136 + /**辅助检查结果录入 **/
  137 + //血红蛋白值
  138 + private String xhdb;
  139 + //白细胞计数值
  140 + private String bxbjs ;
  141 + // 血小板
  142 + private String platelet ;
  143 + //血常规其他
  144 + private String chgOther;
  145 + //尿蛋白
  146 + private String ndb;
  147 + //尿糖
  148 + private String nt;
  149 + //尿同体
  150 + private String urineKetone;
  151 + //尿潜血
  152 + private String bld ;
  153 + //尿常规其他
  154 + private String ncgOther;
  155 + private String abo;
  156 + private String rh;
  157 + // 血糖
  158 + private String bloodSugar;
  159 + // B超
  160 + private String bChao ;
  161 + // 胎数
  162 + private String tireNumber ;
  163 + //血清谷丙转氨酶
  164 + private String xqgbzam ;
  165 + //血清谷草转氨酶
  166 + private String xqgczam ;
  167 + //白蛋白
  168 + private String albumin ;
  169 + //总胆红素
  170 + private String totalBilirubin;
  171 + //结合胆红素
  172 + private String jhBilirubin ;
  173 + // 乙肝表面抗原
  174 + private String ygbmky ;
  175 + //乙肝表面抗体
  176 + private String ygbmkt ;
  177 + //乙肝e抗原
  178 + private String ygeky ;
  179 + // 乙肝e抗体
  180 + private String ygekt ;
  181 + // 乙肝核心抗体
  182 + private String yghxkt ;
  183 + //血清肌
  184 + private String xqjq ;
  185 + //血尿素氮
  186 + private String xnsd ;
  187 + //梅毒血清实验
  188 + private String mdxqsy;
  189 + //hit抗体检测
  190 + private String hivkt;
  191 + //阴道分泌物
  192 + private Map ydfmw;
  193 + //阴道清洁度
  194 + private String ydqjd;
  195 + //实验结果
  196 + private String syjg;
  197 +
  198 + //自然流产
  199 + private Integer abortionZR;
  200 + //人工流产
  201 + private Integer abortionRG;
  202 +
  203 + public String getBarCode() {
  204 + return barCode;
  205 + }
  206 +
  207 + public void setBarCode(String barCode) {
  208 + this.barCode = barCode;
  209 + }
  210 +
  211 + public Integer getAbortionZR() {
  212 + return abortionZR;
  213 + }
  214 +
  215 + public void setAbortionZR(Integer abortionZR) {
  216 + this.abortionZR = abortionZR;
  217 + }
  218 +
  219 + public Integer getAbortionRG() {
  220 + return abortionRG;
  221 + }
  222 +
  223 + public void setAbortionRG(Integer abortionRG) {
  224 + this.abortionRG = abortionRG;
  225 + }
  226 +
  227 + public String getBg() {
  228 + return bg;
  229 + }
  230 +
  231 + public void setBg(String bg) {
  232 + this.bg = bg;
  233 + }
  234 +
  235 + public Map getBp() {
  236 + return bp;
  237 + }
  238 +
  239 + public void setBp(Map bp) {
  240 + this.bp = bp;
  241 + }
  242 +
  243 + public String getAbo() {
  244 + return abo;
  245 + }
  246 +
  247 + public void setAbo(String abo) {
  248 + this.abo = abo;
  249 + }
  250 +
  251 + public String getAlbumin() {
  252 + return albumin;
  253 + }
  254 +
  255 + public void setAlbumin(String albumin) {
  256 + this.albumin = albumin;
  257 + }
  258 +
  259 + public String getbChao() {
  260 + return bChao;
  261 + }
  262 +
  263 + public void setbChao(String bChao) {
  264 + this.bChao = bChao;
  265 + }
  266 +
  267 + public String getBld() {
  268 + return bld;
  269 + }
  270 +
  271 + public void setBld(String bld) {
  272 + this.bld = bld;
  273 + }
  274 +
  275 + public String getBloodSugar() {
  276 + return bloodSugar;
  277 + }
  278 +
  279 + public void setBloodSugar(String bloodSugar) {
  280 + this.bloodSugar = bloodSugar;
  281 + }
  282 +
  283 + public String getBxbjs() {
  284 + return bxbjs;
  285 + }
  286 +
  287 + public void setBxbjs(String bxbjs) {
  288 + this.bxbjs = bxbjs;
  289 + }
  290 +
  291 + public String getChgOther() {
  292 + return chgOther;
  293 + }
  294 +
  295 + public void setChgOther(String chgOther) {
  296 + this.chgOther = chgOther;
  297 + }
  298 +
  299 + public String getcDueWeek() {
  300 + return cDueWeek;
  301 + }
  302 +
  303 + public void setcDueWeek(String cDueWeek) {
  304 + this.cDueWeek = cDueWeek;
  305 + }
  306 +
  307 + public Map gethHealthInfo() {
  308 + return hHealthInfo;
  309 + }
  310 +
  311 + public void sethHealthInfo(Map hHealthInfo) {
  312 + this.hHealthInfo = hHealthInfo;
  313 + }
  314 +
  315 + public String getDueDate() {
  316 + return dueDate;
  317 + }
  318 +
  319 + public void setDueDate(String dueDate) {
  320 + this.dueDate = dueDate;
  321 + }
  322 +
  323 + public String getHivkt() {
  324 + return hivkt;
  325 + }
  326 +
  327 + public void setHivkt(String hivkt) {
  328 + this.hivkt = hivkt;
  329 + }
  330 +
  331 + public String getJhBilirubin() {
  332 + return jhBilirubin;
  333 + }
  334 +
  335 + public void setJhBilirubin(String jhBilirubin) {
  336 + this.jhBilirubin = jhBilirubin;
  337 + }
  338 +
  339 + public String getLastMenses() {
  340 + return lastMenses;
  341 + }
  342 +
  343 + public void setLastMenses(String lastMenses) {
  344 + this.lastMenses = lastMenses;
  345 + }
  346 +
  347 + public String getMdxqsy() {
  348 + return mdxqsy;
  349 + }
  350 +
  351 + public void setMdxqsy(String mdxqsy) {
  352 + this.mdxqsy = mdxqsy;
  353 + }
  354 +
  355 + public String getNcgOther() {
  356 + return ncgOther;
  357 + }
  358 +
  359 + public void setNcgOther(String ncgOther) {
  360 + this.ncgOther = ncgOther;
  361 + }
  362 +
  363 + public String getNdb() {
  364 + return ndb;
  365 + }
  366 +
  367 + public void setNdb(String ndb) {
  368 + this.ndb = ndb;
  369 + }
  370 +
  371 + public String getNt() {
  372 + return nt;
  373 + }
  374 +
  375 + public void setNt(String nt) {
  376 + this.nt = nt;
  377 + }
  378 +
  379 + public String getPlatelet() {
  380 + return platelet;
  381 + }
  382 +
  383 + public void setPlatelet(String platelet) {
  384 + this.platelet = platelet;
  385 + }
  386 +
  387 + public String getRh() {
  388 + return rh;
  389 + }
  390 +
  391 + public void setRh(String rh) {
  392 + this.rh = rh;
  393 + }
  394 +
  395 + public String getSyjg() {
  396 + return syjg;
  397 + }
  398 +
  399 + public void setSyjg(String syjg) {
  400 + this.syjg = syjg;
  401 + }
  402 +
  403 + public String getTireNumber() {
  404 + return tireNumber;
  405 + }
  406 +
  407 + public void setTireNumber(String tireNumber) {
  408 + this.tireNumber = tireNumber;
  409 + }
  410 +
  411 + public String getTotalBilirubin() {
  412 + return totalBilirubin;
  413 + }
  414 +
  415 + public void setTotalBilirubin(String totalBilirubin) {
  416 + this.totalBilirubin = totalBilirubin;
  417 + }
  418 +
  419 + public String getUrineKetone() {
  420 + return urineKetone;
  421 + }
  422 +
  423 + public void setUrineKetone(String urineKetone) {
  424 + this.urineKetone = urineKetone;
  425 + }
  426 +
  427 + public String getXhdb() {
  428 + return xhdb;
  429 + }
  430 +
  431 + public void setXhdb(String xhdb) {
  432 + this.xhdb = xhdb;
  433 + }
  434 +
  435 + public String getXnsd() {
  436 + return xnsd;
  437 + }
  438 +
  439 + public void setXnsd(String xnsd) {
  440 + this.xnsd = xnsd;
  441 + }
  442 +
  443 + public String getXqgbzam() {
  444 + return xqgbzam;
  445 + }
  446 +
  447 + public void setXqgbzam(String xqgbzam) {
  448 + this.xqgbzam = xqgbzam;
  449 + }
  450 +
  451 + public String getXqgczam() {
  452 + return xqgczam;
  453 + }
  454 +
  455 + public void setXqgczam(String xqgczam) {
  456 + this.xqgczam = xqgczam;
  457 + }
  458 +
  459 + public String getXqjq() {
  460 + return xqjq;
  461 + }
  462 +
  463 + public void setXqjq(String xqjq) {
  464 + this.xqjq = xqjq;
  465 + }
  466 +
  467 + public Map getYdfmw() {
  468 + return ydfmw;
  469 + }
  470 +
  471 + public void setYdfmw(Map ydfmw) {
  472 + this.ydfmw = ydfmw;
  473 + }
  474 +
  475 + public String getYdqjd() {
  476 + return ydqjd;
  477 + }
  478 +
  479 + public void setYdqjd(String ydqjd) {
  480 + this.ydqjd = ydqjd;
  481 + }
  482 +
  483 + public String getYgbmkt() {
  484 + return ygbmkt;
  485 + }
  486 +
  487 + public void setYgbmkt(String ygbmkt) {
  488 + this.ygbmkt = ygbmkt;
  489 + }
  490 +
  491 + public String getYgbmky() {
  492 + return ygbmky;
  493 + }
  494 +
  495 + public void setYgbmky(String ygbmky) {
  496 + this.ygbmky = ygbmky;
  497 + }
  498 +
  499 + public String getYgekt() {
  500 + return ygekt;
  501 + }
  502 +
  503 + public void setYgekt(String ygekt) {
  504 + this.ygekt = ygekt;
  505 + }
  506 +
  507 + public String getYgeky() {
  508 + return ygeky;
  509 + }
  510 +
  511 + public void setYgeky(String ygeky) {
  512 + this.ygeky = ygeky;
  513 + }
  514 +
  515 + public String getYghxkt() {
  516 + return yghxkt;
  517 + }
  518 +
  519 + public void setYghxkt(String yghxkt) {
  520 + this.yghxkt = yghxkt;
  521 + }
  522 +
  523 + public String getParentId() {
  524 + return parentId;
  525 + }
  526 +
  527 + public void setParentId(String parentId) {
  528 + this.parentId = parentId;
  529 + }
  530 +
  531 + public String getId() {
  532 + return id;
  533 + }
  534 +
  535 + public void setId(String id) {
  536 + this.id = id;
  537 + }
  538 +
  539 + public Integer getAbortion() {
  540 + return abortion;
  541 + }
  542 +
  543 + public String getBaricIndex() {
  544 + return baricIndex;
  545 + }
  546 +
  547 + public void setBaricIndex(String baricIndex) {
  548 + this.baricIndex = baricIndex;
  549 + }
  550 +
  551 + public void setAbortion(Integer abortion) {
  552 + this.abortion = abortion;
  553 + }
  554 +
  555 + public Integer getBirthDefect() {
  556 + return birthDefect;
  557 + }
  558 +
  559 + public void setBirthDefect(Integer birthDefect) {
  560 + this.birthDefect = birthDefect;
  561 + }
  562 +
  563 + public Integer getDelivery() {
  564 + return delivery;
  565 + }
  566 +
  567 + public void setDelivery(Integer delivery) {
  568 + this.delivery = delivery;
  569 + }
  570 +
  571 + public Integer getNeoDeath() {
  572 + return neoDeath;
  573 + }
  574 +
  575 + public void setNeoDeath(Integer neoDeath) {
  576 + this.neoDeath = neoDeath;
  577 + }
  578 +
  579 + public Integer getPlanedProd() {
  580 + return planedProd;
  581 + }
  582 +
  583 + public void setPlanedProd(Integer planedProd) {
  584 + this.planedProd = planedProd;
  585 + }
  586 +
  587 + public Integer getPregnancyTimes() {
  588 + return pregnancyTimes;
  589 + }
  590 +
  591 + public void setPregnancyTimes(Integer pregnancyTimes) {
  592 + this.pregnancyTimes = pregnancyTimes;
  593 + }
  594 +
  595 + public Integer getProdTime() {
  596 + return prodTime;
  597 + }
  598 +
  599 + public void setProdTime(Integer prodTime) {
  600 + this.prodTime = prodTime;
  601 + }
  602 +
  603 + public Integer getStillbirth() {
  604 + return stillbirth;
  605 + }
  606 +
  607 + public void setStillbirth(Integer stillbirth) {
  608 + this.stillbirth = stillbirth;
  609 + }
  610 +
  611 + public Integer getStillChan() {
  612 + return stillChan;
  613 + }
  614 +
  615 + public void setStillChan(Integer stillChan) {
  616 + this.stillChan = stillChan;
  617 + }
  618 +
  619 + public Map getCestationInfo() {
  620 + return cestationInfo;
  621 + }
  622 +
  623 + public void setCestationInfo(Map cestationInfo) {
  624 + this.cestationInfo = cestationInfo;
  625 + }
  626 +
  627 + public String getCheckTime() {
  628 + return checkTime;
  629 + }
  630 +
  631 + public void setCheckTime(String checkTime) {
  632 + this.checkTime = checkTime;
  633 + }
  634 +
  635 +
  636 + public String getCervical() {
  637 + return cervical;
  638 + }
  639 +
  640 + public void setCervical(String cervical) {
  641 + this.cervical = cervical;
  642 + }
  643 +
  644 + public List getDiagnosis() {
  645 + return diagnosis;
  646 + }
  647 +
  648 + public void setDiagnosis(List diagnosis) {
  649 + this.diagnosis = diagnosis;
  650 + }
  651 +
  652 + public String getFujian() {
  653 + return fujian;
  654 + }
  655 +
  656 + public void setFujian(String fujian) {
  657 + this.fujian = fujian;
  658 + }
  659 +
  660 + public String getHeart() {
  661 + return heart;
  662 + }
  663 +
  664 + public void setHeart(String heart) {
  665 + this.heart = heart;
  666 + }
  667 +
  668 + public String getLungs() {
  669 + return lungs;
  670 + }
  671 +
  672 + public void setLungs(String lungs) {
  673 + this.lungs = lungs;
  674 + }
  675 +
  676 + public String getUterus() {
  677 + return uterus;
  678 + }
  679 +
  680 + public void setUterus(String uterus) {
  681 + this.uterus = uterus;
  682 + }
  683 +
  684 + public String getVagina() {
  685 + return vagina;
  686 + }
  687 +
  688 + public void setVagina(String vagina) {
  689 + this.vagina = vagina;
  690 + }
  691 +
  692 + public String getVulva() {
  693 + return vulva;
  694 + }
  695 +
  696 + public void setVulva(String vulva) {
  697 + this.vulva = vulva;
  698 + }
  699 +
  700 + public String getGuide() {
  701 + return guide;
  702 + }
  703 +
  704 + public void setGuide(String guide) {
  705 + this.guide = guide;
  706 + }
  707 +
  708 + public String getFuwei() {
  709 + return fuwei;
  710 + }
  711 +
  712 + public void setFuwei(String fuwei) {
  713 + this.fuwei = fuwei;
  714 + }
  715 +
  716 + public String getGonggao() {
  717 + return gonggao;
  718 + }
  719 +
  720 + public void setGonggao(String gonggao) {
  721 + this.gonggao = gonggao;
  722 + }
  723 +
  724 + public String getHeight() {
  725 + return height;
  726 + }
  727 +
  728 + public void setHeight(String height) {
  729 + this.height = height;
  730 + }
  731 +
  732 + public List getHighrisk() {
  733 + return highrisk;
  734 + }
  735 +
  736 + public void setHighrisk(List highrisk) {
  737 + this.highrisk = highrisk;
  738 + }
  739 +
  740 + public String getHighriskSocre() {
  741 + return highriskSocre;
  742 + }
  743 +
  744 + public void setHighriskSocre(String highriskSocre) {
  745 + this.highriskSocre = highriskSocre;
  746 + }
  747 +
  748 + public String getNextCheckTime() {
  749 + return nextCheckTime;
  750 + }
  751 +
  752 + public void setNextCheckTime(String nextCheckTime) {
  753 + this.nextCheckTime = nextCheckTime;
  754 + }
  755 +
  756 + public Map getOtherHighRisk() {
  757 + return otherHighRisk;
  758 + }
  759 +
  760 + public void setOtherHighRisk(Map otherHighRisk) {
  761 + this.otherHighRisk = otherHighRisk;
  762 + }
  763 +
  764 + public List getPlacentas() {
  765 + return placentas;
  766 + }
  767 +
  768 + public void setPlacentas(List placentas) {
  769 + this.placentas = placentas;
  770 + }
  771 +
  772 +
  773 +
  774 + public String getProdDoctor() {
  775 + return prodDoctor;
  776 + }
  777 +
  778 + public void setProdDoctor(String prodDoctor) {
  779 + this.prodDoctor = prodDoctor;
  780 + }
  781 +
  782 +
  783 +
  784 + public String getTireNumber1() {
  785 + return tireNumber1;
  786 + }
  787 +
  788 + public void setTireNumber1(String tireNumber1) {
  789 + this.tireNumber1 = tireNumber1;
  790 + }
  791 +
  792 + public String getTreatOpinion() {
  793 + return treatOpinion;
  794 + }
  795 +
  796 + public void setTreatOpinion(String treatOpinion) {
  797 + this.treatOpinion = treatOpinion;
  798 + }
  799 +
  800 + public String getWeight() {
  801 + return weight;
  802 + }
  803 +
  804 + public void setWeight(String weight) {
  805 + this.weight = weight;
  806 + }
  807 +
  808 + public Map getFamilyHistory() {
  809 + return familyHistory;
  810 + }
  811 +
  812 + public void setFamilyHistory(Map familyHistory) {
  813 + this.familyHistory = familyHistory;
  814 + }
  815 +
  816 + public Map getFksxHistory() {
  817 + return fksxHistory;
  818 + }
  819 +
  820 + public void setFksxHistory(Map fksxHistory) {
  821 + this.fksxHistory = fksxHistory;
  822 + }
  823 +
  824 + public Map getPastHistory() {
  825 + return pastHistory;
  826 + }
  827 +
  828 + public void setPastHistory(Map pastHistory) {
  829 + this.pastHistory = pastHistory;
  830 + }
  831 +
  832 + public Map getPersonalHistory() {
  833 + return personalHistory;
  834 + }
  835 +
  836 + public void setPersonalHistory(Map personalHistory) {
  837 + this.personalHistory = personalHistory;
  838 + }
  839 +
  840 + public Map getYmjzHistory() {
  841 + return ymjzHistory;
  842 + }
  843 +
  844 + public void setYmjzHistory(Map ymjzHistory) {
  845 + this.ymjzHistory = ymjzHistory;
  846 + }
  847 +
  848 + public String getYqWeight() {
  849 + return yqWeight;
  850 + }
  851 +
  852 + public void setYqWeight(String yqWeight) {
  853 + this.yqWeight = yqWeight;
  854 + }
  855 +
  856 + public Map getYsfyHistory() {
  857 + return ysfyHistory;
  858 + }
  859 +
  860 + public void setYsfyHistory(Map ysfyHistory) {
  861 + this.ysfyHistory = ysfyHistory;
  862 + }
  863 +
  864 + public Map getYwgmHistory() {
  865 + return ywgmHistory;
  866 + }
  867 +
  868 + public void setYwgmHistory(Map ywgmHistory) {
  869 + this.ywgmHistory = ywgmHistory;
  870 + }
  871 +
  872 + public String getPid() {
  873 + return pid;
  874 + }
  875 +
  876 + public void setPid(String pid) {
  877 + this.pid = pid;
  878 + }
  879 +
  880 +
  881 +}
parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/DiagnoseAssistKeymap.java View file @ bea667a
  1 +package com.lyms.hospital.response.keymap;
  2 +
  3 +/**
  4 + * 辅助检查-新老系统字段名映射
  5 + * @author xujiahong
  6 + *
  7 + */
  8 +public class DiagnoseAssistKeymap {
  9 +
  10 + /*
  11 + 【未映射字段（需要手动get，set）】
  12 + DIAGNOSE_ASSIT=======================
  13 +
  14 + ExamAddRequest=======================
  15 +
  16 + */
  17 +
  18 + public static String[] original = {
  19 +
  20 + /*
  21 + * 辅助检查（DIAGNOSE_ASSIT）
  22 + */
  23 +// //其他字段
  24 +// "id",//
  25 +// "diagnoseId",//
  26 +// "diagnoseType",//
  27 +// "gonorrhoea",//淋病
  28 +// "imageXt",//胸透描述
  29 +// "childBonez",//骨密度Z值（儿保）
  30 +// "childKgj",//髋关节检查（儿保）
  31 +
  32 + //血常规（4）
  33 + "bloodroutineXhdb",//
  34 + "bloodroutineBxbjs",//
  35 + "bloodroutineXxbjs",//
  36 + "bloodroutineOther",//
  37 +
  38 + //尿常规（5）
  39 + "pissNdb",//
  40 + "pissNt",//
  41 + "pissNtt",//
  42 + "pissNqx",//
  43 + "pissOther",//
  44 +
  45 + //血型（3）
  46 + "bloodtype",//
  47 + "bloodtypeRh",//
  48 + "bloodtypeXt",//
  49 +
  50 + //肝功能（6）
  51 + "liverXqgbzam",//
  52 + "liverXqgczam",//
  53 + "liverBdb",//
  54 + "liverZdhs",//
  55 + "liverZhdhs",//
  56 + "liverBg",//【新字段】丙肝
  57 +
  58 + //乙肝五项 5
  59 + "hepatitisbYgbmky",//
  60 + "hepatitisbYgbmkt",//
  61 + "hepatitisbYgeky",//
  62 + "hepatitisbYgekt",//
  63 + "hepatitisbYghxkt",//
  64 +
  65 + //肾功能 2
  66 + "kidneyXqjg",//
  67 + "kidneyXnsd",//
  68 +
  69 + //梅毒血清实验 2
  70 + "syphilisSyjg",//
  71 + "syphilisHiv",//
  72 +
  73 + //阴道分泌物 5
  74 +// "vaginaDc",//
  75 +// "vaginaJsjmj",//
  76 +// "vaginaOther",//
  77 +// "vaginaOtherTxt",//
  78 + "vaginaYdqjd",//
  79 +
  80 + //影像检查 1
  81 + "imageBultrasound",//
  82 +
  83 + };
  84 +
  85 + public static String[] alias = {
  86 +
  87 + /*
  88 + * 辅助检查（DIAGNOSE_ASSIT）
  89 + */
  90 + //其他字段
  91 +
  92 + //血常规 4
  93 + "xhdb",//
  94 + "bxbjs",//
  95 + "platelet",//
  96 + "chgOther",//
  97 +
  98 + //尿常规 5
  99 + "ndb",//
  100 + "nt",//
  101 + "urineKetone",//
  102 + "bld",//
  103 + "ncgOther",//
  104 +
  105 + //血型 3
  106 + "abo",//
  107 + "rh",//
  108 + "bloodSugar",//
  109 +
  110 + //肝功能 6
  111 + "xqgbzam",//
  112 + "xqgczam",//
  113 + "albumin",//
  114 + "totalBilirubin",//
  115 + "jhBilirubin",//
  116 + "liverBg",//【新字段】丙肝
  117 +
  118 + //乙肝五项 5
  119 + "ygbmky",//
  120 + "ygbmkt",//
  121 + "ygeky",//
  122 + "ygekt",//
  123 + "yghxkt",//
  124 +
  125 + //肾功能 2
  126 + "xqjq",//
  127 + "xnsd",//
  128 +
  129 + //梅毒血清实验 2
  130 + "mdxqsy",//
  131 + "hivkt",//
  132 +
  133 + //阴道分泌物 5
  134 +// "ydfmw",//Map 字段
  135 + "ydqjd",//阴道清洁度
  136 +
  137 + //影像检查 1
  138 + "bChao",//
  139 +
  140 +
  141 +// "barCode",//
  142 +// "bg",//
  143 +// "bp",//
  144 +// "cestationInfo",//
  145 +// "diagnosis",//
  146 +// "dueDate",//
  147 +// "familyHistory",//
  148 +// "fksxHistory",//
  149 +// "hHealthInfo",//
  150 +// "id",//
  151 +// "lastMenses",//
  152 +// "otherHighRisk",//
  153 +// "parentId",//
  154 +// "pastHistory",//
  155 +// "personalHistory",//
  156 +// "pid",//
  157 +// "placentas",//
  158 +// "syjg",//
  159 +// "tireNumber",//
  160 +// "ymjzHistory",//
  161 +// "ysfyHistory",//
  162 +// "ywgmHistory",//
  163 + };
  164 +
  165 +}
parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanExamKeymap.java View file @ bea667a
  1 +package com.lyms.hospital.response.keymap;
  2 +
  3 +/**
  4 + * 孕妇产检-新老系统字段名映射
  5 + * @author xujiahong
  6 + *
  7 + */
  8 +public class WomanExamKeymap {
  9 +
  10 + /*
  11 + *
  12 + 【未映射字段（需要手动get，set）】
  13 + DIAGNOSE_INFO=======================
  14 + "id",//产检记录ID
  15 + "personId",//居民表ID
  16 + "womanId",//孕妇档案ID
  17 +
  18 + "orgId",//医院ID
  19 + "type",//诊断类型，0为初诊，1为复诊
  20 + 【未知字段】
  21 + "fuzhongObstetrics",//浮肿
  22 +
  23 +
  24 +
  25 + ExamAddRequest=======================
  26 +
  27 + */
  28 +
  29 +
  30 +
  31 + public static String[] original = {
  32 +
  33 + /*
  34 + * 诊断基础信息（DIAGNOSE_INFO）
  35 + */
  36 +
  37 + //基础信息字段（4）
  38 + "doctorId",//医生ID
  39 + "diagnoseTime",//产检时间
  40 + "nextinspectTime",//下次检查日期
  41 + "nextinspectNum",//下次产检孕周数
  42 +
  43 + //孕产史（11）
  44 + "yunNum",//
  45 + "chanNum",//
  46 + "shunNum",//
  47 + "paoNum",//
  48 + "liuNum",//
  49 + "ziranNum",//自然
  50 + "rengongNum",//人工
  51 + "sitaiNum",//
  52 + "sichanNum",//
  53 + "childdieNum",//
  54 + "birthdefectNum",//
  55 +
  56 + //一般检查（8）
  57 + "height",//
  58 + "weight",//
  59 + "weightAgo",//孕前体重
  60 + "weightIndex",//
  61 + "bloodShrink",//【新字段】血压_收缩压
  62 + "bloodDiastole",//【新字段】血压_舒张压
  63 + "heart",//
  64 + "lung",//
  65 +
  66 + //妇科检查（5）
  67 + "waiyinWoman",//
  68 + "yindaoWoman",//
  69 + "gongjingWoman",//
  70 + "zigongWoman",//
  71 + "fujianWoman",//
  72 +
  73 + //产科检查（3）
  74 + "gonggaoObstetrics",//
  75 + "fuweiObstetrics",//
  76 +// "fuzhongObstetrics",//浮肿
  77 + "taishuObstetrics",//
  78 +
  79 + //高危评分（5）
  80 +// "hasHighrisk",//
  81 +// "cusHrColorcode",//
  82 +// "cusHrColortext",//
  83 +// "cusHrName",//
  84 +// "cusHrGrade",//
  85 +
  86 + //诊断指导（2）
  87 +// "hasDiagnose",//
  88 + "disposeSuggest",//
  89 + "guideSuggest",//
  90 +
  91 +
  92 + };
  93 +
  94 + public static String[] alias = {
  95 +
  96 + //基础信息字段（4）
  97 + "prodDoctor",//
  98 + "checkTime",//
  99 + "nextCheckTime",//
  100 + "cDueWeek",//
  101 +
  102 + //孕产史（11）
  103 + "pregnancyTimes",//孕次
  104 + "prodTime",//产次
  105 + "delivery",//顺产
  106 + "planedProd",//刨宫产
  107 + "abortion",//流产
  108 + "abortionZR",//
  109 + "abortionRG",//
  110 + "stillbirth",//死胎
  111 + "stillChan",//死产
  112 + "neoDeath",//新生儿死亡
  113 + "birthDefect",//出生缺陷儿
  114 +
  115 + //一般检查（8）
  116 + "height",//
  117 + "weight",//
  118 + "yqWeight",//
  119 + "baricIndex",//
  120 + //之前是map装起来的
  121 + "bloodShrink",//【新字段】血压_收缩压
  122 + "bloodDiastole",//【新字段】血压_舒张压
  123 + "heart",//
  124 + "lungs",//
  125 +
  126 + //妇科检查（5）外阴，阴道，宫颈，子宫，附件
  127 + "vulva",//
  128 + "vagina",//
  129 + "cervical",//
  130 + "uterus",//
  131 + "fujian",//
  132 +
  133 + //产科检查（3）宫高，腹围，胎数
  134 + "gonggao",//
  135 + "fuwei",//
  136 + "tireNumber1",//
  137 +
  138 + //高危评分（5）
  139 +// "highriskSocre",//高危评分
  140 +
  141 +
  142 + //诊断指导（2）
  143 + "treatOpinion",//处理意见
  144 + "guide",//指导意见
  145 +
  146 +
  147 + };
  148 +
  149 +}
parent/hospital.web/src/main/java/com/lyms/hospital/util/trans/XjhMapUtil.java View file @ bea667a
... ... @@ -11,7 +11,8 @@
11 11 import java.util.Map;
12 12 import java.util.Set;
13 13  
14   -import com.lyms.hospital.response.keymap.WomanFetationRecordKeymap;
  14 +import com.lyms.hospital.entity.assist.DiagnoseAssit;
  15 +import com.lyms.hospital.request.exam.ExamAddRequest;
15 16 import com.lyms.util.DateUtil;
16 17  
17 18 public class XjhMapUtil {
... ... @@ -284,8 +285,8 @@
284 285 }
285 286  
286 287 public static void main(String[] args) {
287   -// printField(new WomanHusband());
288   - printJsonByArray(WomanFetationRecordKeymap.alias);
  288 + printField(new DiagnoseAssit());
  289 +// printJsonByArray(WomanFetationRecordKeymap.alias);
289 290 }
290 291  
291 292 }