jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a9747ccd4133c31abb78a00f28418adb3ca22574

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

增加字段

Showing 10 changed files with 479 additions and 69 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java View file @ a9747cc
... ... @@ -31,6 +31,7 @@
31 31 private String remarks;
32 32 private Date lastLoginTime;
33 33 private Integer ksId;
  34 + private List<Integer> zhichenIds;
34 35  
35 36 private String keyword;
36 37 private Integer roleId;
... ... @@ -38,6 +39,14 @@
38 39 private Integer otherAccount; //第三方帐号, 1医院帐号
39 40 public Integer getOtherAccount() {
40 41 return otherAccount;
  42 + }
  43 +
  44 + public List<Integer> getZhichenIds() {
  45 + return zhichenIds;
  46 + }
  47 +
  48 + public void setZhichenIds(List<Integer> zhichenIds) {
  49 + this.zhichenIds = zhichenIds;
41 50 }
42 51  
43 52 public Date getGteCreated() {
platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml View file @ a9747cc
... ... @@ -203,6 +203,13 @@
203 203 <if test="remarks != null and remarks != ''">
204 204 and remarks = #{remarks,jdbcType=VARCHAR}
205 205 </if>
  206 + <if test="zhichenIds != null and zhichenIds.size() !=0 ">
  207 + AND zhiChenId IN
  208 + <foreach collection="zhichenIds" item="title"
  209 + index="index" open="(" close=")" separator=",">
  210 + #{title}
  211 + </foreach>
  212 + </if>
206 213 <if test="lastLoginTime != null">
207 214 and last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP}
208 215 </if>
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ a9747cc
... ... @@ -119,6 +119,72 @@
119 119 */
120 120 private String diagnosisOther;
121 121  
  122 +
  123 + //早孕期病毒检测
  124 + private String zyqbd;
  125 + //nt检查
  126 + private String ntjc;
  127 + //产前筛查
  128 + private String cqsc;
  129 + //胎儿系统排畸b吵
  130 + private String text;
  131 + //75gODTT
  132 + private String s75god;
  133 + //甲状腺功能
  134 + private String jzxgn;
  135 +
  136 + public static long getSerialVersionUID() {
  137 + return serialVersionUID;
  138 + }
  139 +
  140 + public String getZyqbd() {
  141 + return zyqbd;
  142 + }
  143 +
  144 + public void setZyqbd(String zyqbd) {
  145 + this.zyqbd = zyqbd;
  146 + }
  147 +
  148 + public String getNtjc() {
  149 + return ntjc;
  150 + }
  151 +
  152 + public void setNtjc(String ntjc) {
  153 + this.ntjc = ntjc;
  154 + }
  155 +
  156 + public String getCqsc() {
  157 + return cqsc;
  158 + }
  159 +
  160 + public void setCqsc(String cqsc) {
  161 + this.cqsc = cqsc;
  162 + }
  163 +
  164 + public String getText() {
  165 + return text;
  166 + }
  167 +
  168 + public void setText(String text) {
  169 + this.text = text;
  170 + }
  171 +
  172 + public String getS75god() {
  173 + return s75god;
  174 + }
  175 +
  176 + public void setS75god(String s75god) {
  177 + this.s75god = s75god;
  178 + }
  179 +
  180 + public String getJzxgn() {
  181 + return jzxgn;
  182 + }
  183 +
  184 + public void setJzxgn(String jzxgn) {
  185 + this.jzxgn = jzxgn;
  186 + }
  187 +
122 188 public String getGonggaoSelect() {
123 189 return gonggaoSelect;
124 190 }
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ a9747cc
... ... @@ -113,6 +113,68 @@
113 113 //操作人
114 114 private Integer operator;
115 115  
  116 +
  117 + //早孕期病毒检测
  118 + private String zyqbd;
  119 + //nt检查
  120 + private String ntjc;
  121 + //产前筛查
  122 + private String cqsc;
  123 + //胎儿系统排畸b吵
  124 + private String text;
  125 + //75gODTT
  126 + private String s75god;
  127 + //甲状腺功能
  128 + private String jzxgn;
  129 +
  130 + public String getZyqbd() {
  131 + return zyqbd;
  132 + }
  133 +
  134 + public void setZyqbd(String zyqbd) {
  135 + this.zyqbd = zyqbd;
  136 + }
  137 +
  138 + public String getNtjc() {
  139 + return ntjc;
  140 + }
  141 +
  142 + public void setNtjc(String ntjc) {
  143 + this.ntjc = ntjc;
  144 + }
  145 +
  146 + public String getCqsc() {
  147 + return cqsc;
  148 + }
  149 +
  150 + public void setCqsc(String cqsc) {
  151 + this.cqsc = cqsc;
  152 + }
  153 +
  154 + public String getText() {
  155 + return text;
  156 + }
  157 +
  158 + public void setText(String text) {
  159 + this.text = text;
  160 + }
  161 +
  162 + public String getS75god() {
  163 + return s75god;
  164 + }
  165 +
  166 + public void setS75god(String s75god) {
  167 + this.s75god = s75god;
  168 + }
  169 +
  170 + public String getJzxgn() {
  171 + return jzxgn;
  172 + }
  173 +
  174 + public void setJzxgn(String jzxgn) {
  175 + this.jzxgn = jzxgn;
  176 + }
  177 +
116 178 public String getGongGaoSelect() {
117 179 return gongGaoSelect;
118 180 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java View file @ a9747cc
... ... @@ -23,10 +23,7 @@
23 23 import org.springframework.beans.factory.annotation.Autowired;
24 24 import org.springframework.stereotype.Controller;
25 25 import org.springframework.util.StopWatch;
26   -import org.springframework.web.bind.annotation.RequestBody;
27   -import org.springframework.web.bind.annotation.RequestMapping;
28   -import org.springframework.web.bind.annotation.RequestMethod;
29   -import org.springframework.web.bind.annotation.ResponseBody;
  26 +import org.springframework.web.bind.annotation.*;
30 27  
31 28 import javax.servlet.http.HttpServletRequest;
32 29 import javax.servlet.http.HttpServletResponse;
33 30  
... ... @@ -102,9 +99,9 @@
102 99 @ResponseBody
103 100 public BaseResponse queryHisCheckList2(String cardNo, int ftype,HttpServletRequest request) {
104 101 if ("1".equals(HIS_VERSION)) {
105   - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV1.queryCheckListupdate(cardNo,ftype));
  102 + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV1.queryCheckListupdate(cardNo, ftype));
106 103 } else if ("2".equals(HIS_VERSION)) {
107   - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV2.queryCheckListupdate(cardNo,ftype));
  104 + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV2.queryCheckListupdate(cardNo, ftype));
108 105 } else if ("3".equals(HIS_VERSION)) {
109 106 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据");
110 107 } else if ("4".equals(HIS_VERSION)) {
... ... @@ -308,10 +305,17 @@
308 305 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
309 306 }
310 307  
311   -
312   -
313   -
314   -
315   -
  308 + /**
  309 + * 获取最后一次重大检查结果
  310 + *
  311 + * @param request
  312 + * @return
  313 + */
  314 + @RequestMapping(method = RequestMethod.GET, value = "/last")
  315 + @TokenRequired
  316 + public BaseResponse getLastCheck(HttpServletRequest request,@RequestParam("pid")String pid){
  317 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  318 + return antenatalExaminationFacade.getLastCheck(loginState.getId(),pid);
  319 + }
316 320 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java View file @ a9747cc
... ... @@ -66,6 +66,16 @@
66 66 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
67 67 return stopPregnancyFacade.queryInPerson(loginState.getId());
68 68 }
69   -
  69 + /**
  70 + * 返回该医院可选择的录入人
  71 + * @return
  72 + */
  73 + @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson2")
  74 + @ResponseBody
  75 + @TokenRequired
  76 + public BaseResponse queryInPerson2(HttpServletRequest request) {
  77 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  78 + return stopPregnancyFacade.queryInPerson2(loginState.getId());
  79 + }
70 80 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ a9747cc
... ... @@ -2137,6 +2137,62 @@
2137 2137 return highScoreResult;
2138 2138 }
2139 2139  
  2140 + public BaseResponse getLastCheck(Integer userId,String pid){
  2141 + AntExQuery antExQuery1 = new AntExQuery();
  2142 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  2143 + antExQuery1.setHospitalId(hospitalId);
  2144 + antExQuery1.setPid(pid);
  2145 + antExQuery1.setYn(YnEnums.YES.getId());
  2146 + List<AntenatalExaminationModel> examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
  2147 + Map m =new HashMap();
  2148 + if(CollectionUtils.isNotEmpty(examinationModelList)){
  2149 + for(AntenatalExaminationModel model:examinationModelList){
  2150 + String zybd=model.getZyqbd();
  2151 + String ntjc= model.getNtjc();
  2152 + String cqsc= model.getCqsc();
  2153 + String text= model.getText();
  2154 + String s75god= model.getS75god();
  2155 + String jzxgn= model.getJzxgn();
  2156 + if(StringUtils.isNotEmpty(zybd)||StringUtils.isNotEmpty(ntjc)||StringUtils.isNotEmpty(cqsc)||
  2157 + StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75god)||StringUtils.isNotEmpty(jzxgn)){
  2158 + m.put("zybd",zybd);
  2159 + m.put("ntjc",ntjc);
  2160 + m.put("cqsc",cqsc);
  2161 + m.put("text",text);
  2162 + m.put("s75god",s75god);
  2163 + m.put("jzxgn",jzxgn);
  2164 + break;
  2165 + }
  2166 + }
  2167 + }
  2168 + AntExChuQuery antExChuQuery =new AntExChuQuery();
  2169 + antExQuery1.setHospitalId(hospitalId);
  2170 + antExQuery1.setPid(pid);
  2171 + antExQuery1.setYn(YnEnums.YES.getId());
  2172 + List<AntExChuModel> chuModelList= antenatalExaminationService.queryAntExChu(antExChuQuery);
  2173 + if(CollectionUtils.isNotEmpty(chuModelList)){
  2174 + for(AntExChuModel chu:chuModelList){
  2175 + String zybd=chu.getZyqbd();
  2176 + String ntjc= chu.getNtjc();
  2177 + String cqsc= chu.getCqsc();
  2178 + String text= chu.getText();
  2179 + String s75god= chu.getS75god();
  2180 + String jzxgn= chu.getJzxgn();
  2181 + if(StringUtils.isNotEmpty(zybd)||StringUtils.isNotEmpty(ntjc)||StringUtils.isNotEmpty(cqsc)||
  2182 + StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75god)||StringUtils.isNotEmpty(jzxgn)){
  2183 + m.put("zybd",zybd);
  2184 + m.put("ntjc",ntjc);
  2185 + m.put("cqsc",cqsc);
  2186 + m.put("text",text);
  2187 + m.put("s75god",s75god);
  2188 + m.put("jzxgn",jzxgn);
  2189 + break;
  2190 + }
  2191 + }
  2192 + }
  2193 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("").setData(m);
  2194 + }
  2195 +
2140 2196 public BaseResponse getEnums() {
2141 2197 Map<String, Object> map = new HashMap<>();
2142 2198 map.put("getFetPosition", getFetPosition());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ a9747cc
... ... @@ -399,5 +399,53 @@
399 399 objectResponse.setErrormsg("成功");
400 400 return objectResponse;
401 401 }
  402 +
  403 +
  404 + /**
  405 + * 返回该医院可选择的录入人
  406 + *
  407 + * @return
  408 + */
  409 + public BaseResponse queryInPerson2(Integer id) {
  410 + List<Map> list = new ArrayList<>();
  411 + if (id != null) {
  412 + UsersQuery query = new UsersQuery();
  413 + query.setYn(YnEnums.YES.getId());
  414 + query.setEnable(1);
  415 + query.setId(id);
  416 + List<Integer> lis =new ArrayList<>();
  417 + lis.add(1);
  418 + lis.add(2);
  419 + lis.add(3);
  420 + lis.add(4);
  421 + lis.add(5);
  422 + query.setZhichenIds(lis);
  423 + List<Users> dbusers = usersService.queryUsers(query);
  424 +
  425 + if (CollectionUtils.isNotEmpty(dbusers)) {
  426 + Users dbuser = dbusers.get(0);
  427 + UsersQuery usersQuery = new UsersQuery();
  428 + usersQuery.setYn(YnEnums.YES.getId());
  429 + usersQuery.setOrgId(dbuser.getOrgId());
  430 + usersQuery.setEnable(1);
  431 + List<Users> users = usersService.queryUsers(usersQuery);
  432 +
  433 + if (CollectionUtils.isNotEmpty(users)) {
  434 + for (Users user : users) {
  435 + Map pmap = new HashMap();
  436 + pmap.put("id", user.getId());
  437 + pmap.put("name", user.getName());
  438 + list.add(pmap);
  439 + }
  440 + }
  441 + }
  442 +
  443 + }
  444 + BaseObjectResponse objectResponse = new BaseObjectResponse();
  445 + objectResponse.setData(list);
  446 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  447 + objectResponse.setErrormsg("成功");
  448 + return objectResponse;
  449 + }
402 450 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ a9747cc
... ... @@ -97,6 +97,68 @@
97 97  
98 98 private Integer couponType;
99 99  
  100 +
  101 + //早孕期病毒检测
  102 + private String zyqbd;
  103 + //nt检查
  104 + private String ntjc;
  105 + //产前筛查
  106 + private String cqsc;
  107 + //胎儿系统排畸b吵
  108 + private String text;
  109 + //75gODTT
  110 + private String s75god;
  111 + //甲状腺功能
  112 + private String jzxgn;
  113 +
  114 + public String getZyqbd() {
  115 + return zyqbd;
  116 + }
  117 +
  118 + public void setZyqbd(String zyqbd) {
  119 + this.zyqbd = zyqbd;
  120 + }
  121 +
  122 + public String getNtjc() {
  123 + return ntjc;
  124 + }
  125 +
  126 + public void setNtjc(String ntjc) {
  127 + this.ntjc = ntjc;
  128 + }
  129 +
  130 + public String getCqsc() {
  131 + return cqsc;
  132 + }
  133 +
  134 + public void setCqsc(String cqsc) {
  135 + this.cqsc = cqsc;
  136 + }
  137 +
  138 + public String getText() {
  139 + return text;
  140 + }
  141 +
  142 + public void setText(String text) {
  143 + this.text = text;
  144 + }
  145 +
  146 + public String getS75god() {
  147 + return s75god;
  148 + }
  149 +
  150 + public void setS75god(String s75god) {
  151 + this.s75god = s75god;
  152 + }
  153 +
  154 + public String getJzxgn() {
  155 + return jzxgn;
  156 + }
  157 +
  158 + public void setJzxgn(String jzxgn) {
  159 + this.jzxgn = jzxgn;
  160 + }
  161 +
100 162 public String getGongGaoSelect() {
101 163 return gongGaoSelect;
102 164 }
... ... @@ -192,6 +254,12 @@
192 254 @Override
193 255 public AntenatalExaminationModel convertToDataModel() {
194 256 AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
  257 + examinationModel.setZyqbd(zyqbd);
  258 + examinationModel.setNtjc(ntjc);
  259 + examinationModel.setCqsc(cqsc);
  260 + examinationModel.setText(text);
  261 + examinationModel.setS75god(s75god);
  262 + examinationModel.setJzxgn(jzxgn);
195 263 examinationModel.setId(id);
196 264 examinationModel.setDiagnosisOther(diagnosisOther);
197 265 examinationModel.setBarCode(barCode);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ a9747cc
... ... @@ -13,9 +13,8 @@
13 13 import java.util.Map;
14 14  
15 15 /**
16   - *
17 16 * 产前检查初诊
18   - *
  17 + * <p/>
19 18 * Created by Administrator on 2016/6/20 0020.
20 19 */
21 20 @Form
... ... @@ -24,7 +23,7 @@
24 23 @NotEmpty(message = "孕妇id不能为空")
25 24 private String parentId;
26 25  
27   - private String barCode;
  26 + private String barCode;
28 27  
29 28 private String id;
30 29  
31 30  
32 31  
33 32  
34 33  
35 34  
... ... @@ -35,19 +34,19 @@
35 34 private String lastMenses;
36 35  
37 36 // 既往史
38   - private Map pastHistory ;
  37 + private Map pastHistory;
39 38 // 家族史
40   - private Map familyHistory ;
  39 + private Map familyHistory;
41 40 //个人史
42 41 private Map personalHistory;
43 42 //疫苗接种史
44   - private Map ymjzHistory ;
  43 + private Map ymjzHistory;
45 44 //药物过敏史
46   - private Map ywgmHistory ;
  45 + private Map ywgmHistory;
47 46 //妇科手术史
48   - private Map fksxHistory ;
  47 + private Map fksxHistory;
49 48 // 叶酸服用
50   - private Map ysfyHistory ;
  49 + private Map ysfyHistory;
51 50 //本次妊娠情况
52 51 private Map cestationInfo;
53 52 //丈夫健康情况
54 53  
55 54  
56 55  
... ... @@ -66,17 +65,17 @@
66 65 //死胎
67 66 private Integer stillbirth;
68 67 //死产
69   - private Integer stillChan ;
  68 + private Integer stillChan;
70 69 //新生儿死亡
71 70 private Integer neoDeath;
72 71 //出生缺陷
73 72 private Integer birthDefect;
74 73 // 身高
75   - private String height;
  74 + private String height;
76 75 //体重
77   - private String weight ;
  76 + private String weight;
78 77 //孕前体重
79   - private String yqWeight ;
  78 + private String yqWeight;
80 79 //体重指数
81 80 private String baricIndex;
82 81 //心脏
... ... @@ -109,7 +108,7 @@
109 108 //胎数
110 109 private List<MatDeliverAddRequest.Placenta> placentas;
111 110 //高危因素
112   - private List highrisk ;
  111 + private List highrisk;
113 112 //高危评分
114 113 private String highriskSocre;
115 114 // 其他高危
116 115  
117 116  
118 117  
119 118  
120 119  
121 120  
122 121  
123 122  
124 123  
125 124  
126 125  
127 126  
128 127  
129 128  
130 129  
131 130  
132 131  
133 132  
134 133  
135 134  
136 135  
137 136  
138 137  
139 138  
140 139  
141 140  
142 141  
... ... @@ -128,67 +127,69 @@
128 127 //下次产检时间
129 128 private String nextCheckTime;
130 129 //前端计算出来的孕周
131   - private String cDueWeek;
  130 + private String cDueWeek;
132 131  
133   - /**辅助检查结果录入 **/
  132 + /**
  133 + * 辅助检查结果录入
  134 + **/
134 135 //血红蛋白值
135   - private String xhdb;
  136 + private String xhdb;
136 137 //白细胞计数值
137   - private String bxbjs ;
  138 + private String bxbjs;
138 139 // 血小板
139   - private String platelet ;
  140 + private String platelet;
140 141 //血常规其他
141   - private String chgOther;
  142 + private String chgOther;
142 143 //尿蛋白
143   - private String ndb;
  144 + private String ndb;
144 145 //尿糖
145   - private String nt;
  146 + private String nt;
146 147 //尿同体
147   - private String urineKetone;
148   - //尿潜血
149   - private String bld ;
  148 + private String urineKetone;
  149 + //尿潜血
  150 + private String bld;
150 151 //尿常规其他
151   - private String ncgOther;
152   - private String abo;
153   - private String rh;
  152 + private String ncgOther;
  153 + private String abo;
  154 + private String rh;
154 155 // 血糖1
155   - private String bloodSugar;
  156 + private String bloodSugar;
156 157 // B超
157   - private String bChao ;
  158 + private String bChao;
158 159 // 胎数
159   - private String tireNumber ;
  160 + private String tireNumber;
160 161 //血清谷丙转氨酶
161   - private String xqgbzam ;
  162 + private String xqgbzam;
162 163 //血清谷草转氨酶
163   - private String xqgczam ;
  164 + private String xqgczam;
164 165 //白蛋白
165   - private String albumin ;
  166 + private String albumin;
166 167 //总胆红素
167   - private String totalBilirubin;
  168 + private String totalBilirubin;
168 169 //结合胆红素
169   - private String jhBilirubin ;
  170 + private String jhBilirubin;
170 171 // 乙肝表面抗原
171   - private String ygbmky ;
  172 + private String ygbmky;
172 173 //乙肝表面抗体
173   - private String ygbmkt ;
  174 + private String ygbmkt;
174 175 //乙肝e抗原
175   - private String ygeky ;
  176 + private String ygeky;
176 177 // 乙肝e抗体
177   - private String ygekt ;
  178 + private String ygekt;
178 179 // 乙肝核心抗体
179   - private String yghxkt ;
  180 + private String yghxkt;
180 181 //血清肌
181   - private String xqjq ;
  182 + private String xqjq;
182 183 //血尿素氮
183   - private String xnsd ;
  184 + private String xnsd;
184 185 //梅毒血清实验
185   - private String mdxqsy;
  186 + private String mdxqsy;
186 187 //hit抗体检测
187 188 private String hivkt;
188 189 //阴道分泌物
189   - private Map ydfmw;
  190 + private Map ydfmw;
190 191 //阴道清洁度
191   - private String ydqjd;
  192 + private String ydqjd;
192 193 //实验结果
193 194 private String syjg;
194 195 //引产
... ... @@ -197,6 +198,67 @@
197 198 private Integer gongwaiyun;
198 199 //药物流产次数
199 200 private Integer yaowu;
  201 + //早孕期病毒检测
  202 + private String zyqbd;
  203 + //nt检查
  204 + private String ntjc;
  205 + //产前筛查
  206 + private String cqsc;
  207 + //胎儿系统排畸b吵
  208 + private String text;
  209 + //75gODTT
  210 + private String s75god;
  211 + //甲状腺功能
  212 + private String jzxgn;
  213 +
  214 + public String getZyqbd() {
  215 + return zyqbd;
  216 + }
  217 +
  218 + public void setZyqbd(String zyqbd) {
  219 + this.zyqbd = zyqbd;
  220 + }
  221 +
  222 + public String getNtjc() {
  223 + return ntjc;
  224 + }
  225 +
  226 + public void setNtjc(String ntjc) {
  227 + this.ntjc = ntjc;
  228 + }
  229 +
  230 + public String getCqsc() {
  231 + return cqsc;
  232 + }
  233 +
  234 + public void setCqsc(String cqsc) {
  235 + this.cqsc = cqsc;
  236 + }
  237 +
  238 + public String getText() {
  239 + return text;
  240 + }
  241 +
  242 + public void setText(String text) {
  243 + this.text = text;
  244 + }
  245 +
  246 + public String getS75god() {
  247 + return s75god;
  248 + }
  249 +
  250 + public void setS75god(String s75god) {
  251 + this.s75god = s75god;
  252 + }
  253 +
  254 + public String getJzxgn() {
  255 + return jzxgn;
  256 + }
  257 +
  258 + public void setJzxgn(String jzxgn) {
  259 + this.jzxgn = jzxgn;
  260 + }
  261 +
200 262 //自然流产
201 263 private Integer abortionZR;
202 264 //人工流产
... ... @@ -865,7 +927,6 @@
865 927 }
866 928  
867 929  
868   -
869 930 public String getProdDoctor() {
870 931 return prodDoctor;
871 932 }
... ... @@ -875,7 +936,6 @@
875 936 }
876 937  
877 938  
878   -
879 939 public String getTireNumber1() {
880 940 return tireNumber1;
881 941 }
... ... @@ -974,7 +1034,7 @@
974 1034  
975 1035 @Override
976 1036 public AntExChuModel convertToDataModel() {
977   - AntExChuModel antExChuModel=new AntExChuModel();
  1037 + AntExChuModel antExChuModel = new AntExChuModel();
978 1038 antExChuModel.setYinchan(yinchan);
979 1039 antExChuModel.setGongwaiyun(gongwaiyun);
980 1040 antExChuModel.setYaowu(yaowu);
... ... @@ -982,6 +1042,26 @@
982 1042 antExChuModel.setBirthDefectTodo(birthDefectTodo);
983 1043 antExChuModel.setDiagnosisOther(diagnosisOther);
984 1044 antExChuModel.setBg(bg);
  1045 +
  1046 +// //早孕期病毒检测
  1047 +// private String zyqbd;
  1048 +// //nt检查
  1049 +// private String ntjc;
  1050 +// //产前筛查
  1051 +// private String cqsc;
  1052 +// //胎儿系统排畸b吵
  1053 +// private String text;
  1054 +// //75gODTT
  1055 +// private String s75god;
  1056 +// //甲状腺功能
  1057 +// private String jzxgn;
  1058 +
  1059 + antExChuModel.setZyqbd(zyqbd);
  1060 + antExChuModel.setNtjc(ntjc);
  1061 + antExChuModel.setCqsc(cqsc);
  1062 + antExChuModel.setText(text);
  1063 + antExChuModel.setS75god(s75god);
  1064 + antExChuModel.setJzxgn(jzxgn);
985 1065 antExChuModel.setBarCode(barCode);
986 1066 antExChuModel.setId(id);
987 1067 antExChuModel.setParentId(parentId);
... ... @@ -1026,7 +1106,7 @@
1026 1106 antExChuModel.setCervical(cervical);
1027 1107 antExChuModel.setUterus(uterus);
1028 1108 antExChuModel.setFujian(fujian);
1029   - if(null!=hHealthInfo){
  1109 + if (null != hHealthInfo) {
1030 1110 antExChuModel.sethHealthInfo(JsonUtil.obj2JsonString(hHealthInfo));
1031 1111 }
1032 1112 // antExChuModel.setMdxqsy(mdxqsy);
1033 1113  
1034 1114  
1035 1115  
1036 1116  
1037 1117  
1038 1118  
... ... @@ -1053,31 +1133,31 @@
1053 1133 antExChuModel.setFuwei(fuwei);
1054 1134 antExChuModel.setTireNumber1(tireNumber1);
1055 1135 antExChuModel.setPlacentas(placentas);
1056   - if(null!=bp){
  1136 + if (null != bp) {
1057 1137 antExChuModel.setBp(JsonUtil.obj2JsonString(bp));
1058 1138 }
1059   - if(null!=highrisk){
  1139 + if (null != highrisk) {
1060 1140 antExChuModel.setHighrisk(JsonUtil.array2JsonString(highrisk));
1061 1141 }
1062 1142 antExChuModel.setHighriskSocre(highriskSocre);
1063 1143 antExChuModel.setOtherHighRisk(JsonUtil.obj2JsonString(otherHighRisk));
1064   - if(null!=diagnosis){
  1144 + if (null != diagnosis) {
1065 1145 antExChuModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis));
1066 1146 }
1067 1147 antExChuModel.setTreatOpinion(treatOpinion);
1068 1148 antExChuModel.setDirOpinion(guide);
1069 1149 antExChuModel.setProdDoctor(prodDoctor);
1070   - if(null!=checkTime){
  1150 + if (null != checkTime) {
1071 1151 antExChuModel.setCheckTime(DateUtil.parseYMD(checkTime));
1072 1152 }
1073   - if(null!=nextCheckTime){
  1153 + if (null != nextCheckTime) {
1074 1154 antExChuModel.setNextCheckTime(DateUtil.parseYMD(nextCheckTime));
1075 1155 }
1076 1156 antExChuModel.setcDueWeek(cDueWeek);
1077   - if(StringUtils.isNotEmpty(lastMenses)){
  1157 + if (StringUtils.isNotEmpty(lastMenses)) {
1078 1158 antExChuModel.setLastMenses(DateUtil.parseYMD(lastMenses));
1079 1159 }
1080   - if(StringUtils.isNotEmpty(dueDate)){
  1160 + if (StringUtils.isNotEmpty(dueDate)) {
1081 1161 antExChuModel.setDueDate(DateUtil.parseYMD(dueDate));
1082 1162 }
1083 1163