jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 27066b562f253ed39c8e47adcda5b42ff7a3138a

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

update

Showing 15 changed files with 229 additions and 20 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java View file @ 27066b5
... ... @@ -18,6 +18,7 @@
18 18 private String type;
19 19 // 就诊卡号
20 20 private String vcCardNo;
  21 + private String cardNo;
21 22 // 患者姓名
22 23 private String name;
23 24 // 住院号
... ... @@ -60,6 +61,14 @@
60 61 //医院名称
61 62 private String hospitalName;
62 63  
  64 + public String getCardNo() {
  65 + return cardNo;
  66 + }
  67 +
  68 + public void setCardNo(String cardNo) {
  69 + this.cardNo = cardNo;
  70 + }
  71 +
63 72 public String getHospitalName() {
64 73 return hospitalName;
65 74 }
... ... @@ -246,14 +255,32 @@
246 255  
247 256 @Override
248 257 public String toString() {
249   - return "LisReportModel [id=" + id + ", lisId=" + lisId + ", title="
250   - + title + ", type=" + type + ", vcCardNo=" + vcCardNo
251   - + ", name=" + name + ", bhnum=" + bhnum + ", age=" + age
252   - + ", sex=" + sex + ", applyTime=" + applyTime + ", checkTime="
253   - + checkTime + ", publishTime=" + publishTime + ", applyDoctor="
254   - + applyDoctor + ", applyDept=" + applyDept + ", checker="
255   - + checker + ", modified=" + modified + ", created=" + created
256   - + ", hospitalId=" + hospitalId + "]";
  258 + return "LisReportModel{" +
  259 + "id=" + id +
  260 + ", lisId='" + lisId + '\'' +
  261 + ", title='" + title + '\'' +
  262 + ", type='" + type + '\'' +
  263 + ", vcCardNo='" + vcCardNo + '\'' +
  264 + ", cardNo='" + cardNo + '\'' +
  265 + ", name='" + name + '\'' +
  266 + ", bhnum='" + bhnum + '\'' +
  267 + ", age='" + age + '\'' +
  268 + ", sex='" + sex + '\'' +
  269 + ", applyTime=" + applyTime +
  270 + ", checkTime=" + checkTime +
  271 + ", publishTime=" + publishTime +
  272 + ", applyDoctor='" + applyDoctor + '\'' +
  273 + ", applyDept='" + applyDept + '\'' +
  274 + ", checker='" + checker + '\'' +
  275 + ", modified=" + modified +
  276 + ", created=" + created +
  277 + ", hospitalId='" + hospitalId + '\'' +
  278 + ", phone='" + phone + '\'' +
  279 + ", items=" + items +
  280 + ", status=" + status +
  281 + ", itemJson='" + itemJson + '\'' +
  282 + ", hospitalName='" + hospitalName + '\'' +
  283 + '}';
257 284 }
258 285 }
platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java View file @ 27066b5
... ... @@ -24,6 +24,8 @@
24 24 private String type;
25 25 // 就诊卡号
26 26 private String vcCardNo;
  27 + //身份证
  28 + private String cardNo;
27 29 //儿童社保卡
28 30 private String sINCard;
29 31  
... ... @@ -74,6 +76,14 @@
74 76  
75 77 //检验明细json
76 78 private String itemJson;
  79 +
  80 + public String getCardNo() {
  81 + return cardNo;
  82 + }
  83 +
  84 + public void setCardNo(String cardNo) {
  85 + this.cardNo = cardNo;
  86 + }
77 87  
78 88 public String getsINCard() {
79 89 return sINCard;
platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml View file @ 27066b5
... ... @@ -8,6 +8,7 @@
8 8 TITLE,
9 9 TYPE,
10 10 VCCARDNO,
  11 + CARDNO,
11 12 NAME,
12 13 BHNUM,
13 14 AGE,
... ... @@ -29,6 +30,7 @@
29 30 #{title},
30 31 #{type},
31 32 #{vcCardNo},
  33 + #{cardNo},
32 34 #{name},
33 35 #{bhnum},
34 36 #{age},
... ... @@ -91,6 +93,7 @@
91 93 TITLE AS title,
92 94 TYPE AS type,
93 95 VCCARDNO AS vcCardNo,
  96 + CARDNO AS cardNo,
94 97 NAME AS name,
95 98 BHNUM AS bhnum,
96 99 AGE AS age,
... ... @@ -113,6 +116,9 @@
113 116 </if>
114 117 <if test="(vcCardNo != null and vcCardNo != '') || (sINCard != null and sINCard != '') ">
115 118 AND VCCARDNO = #{vcCardNo} or VCCARDNO = #{sINCard}
  119 + </if>
  120 + <if test="(cardNo != null and cardNo != '') ">
  121 + AND CARDNO = #{cardNo}
116 122 </if>
117 123 <if test="(name != null and name != '') ">
118 124 AND name = #{name}
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ 27066b5
... ... @@ -18,13 +18,25 @@
18 18 public class BabyModel extends BaseModel {
19 19  
20 20 private static final long serialVersionUID = SerialIdEnum.BabyModel.getCid();
  21 + //月龄下拉框
  22 + private String ylSelect;
21 23  
22 24 /*滦平 start */
23   - //耳声发射（1通过/2未通过）
  25 + //耳声发射（1通过/2未通过）不用了
24 26 private Integer esfs;
  27 +
  28 + // 听力是否筛查（20210122 张洁滦平需求，出院小结听力是否筛查 就是 baby耳声发射）
  29 + private Integer isUNHS;
  30 + /**
  31 + * 听筛结果 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过
  32 + */
  33 + private Integer hearScrResult;
  34 +
  35 +
25 36 //听性脑干（1通过/2未通过）
26 37 private Integer txng;
27 38 // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
  39 + // "txngState":1 （20210122 张洁滦平需求 新增 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过）
28 40 private Map<String,Object> txngNew;
29 41 //耳聋基因（1通过/2未通过）
30 42 private Integer eljy;
... ... @@ -1154,6 +1166,14 @@
1154 1166 this.jxBz = jxBz;
1155 1167 }
1156 1168  
  1169 + public String getYlSelect() {
  1170 + return ylSelect;
  1171 + }
  1172 +
  1173 + public void setYlSelect(String ylSelect) {
  1174 + this.ylSelect = ylSelect;
  1175 + }
  1176 +
1157 1177 public Map<String, Object> getJxBzSele() {
1158 1178 return jxBzSele;
1159 1179 }
... ... @@ -1346,6 +1366,14 @@
1346 1366 return buildType;
1347 1367 }
1348 1368  
  1369 + public Integer getIsUNHS() {
  1370 + return isUNHS;
  1371 + }
  1372 +
  1373 + public void setIsUNHS(Integer isUNHS) {
  1374 + this.isUNHS = isUNHS;
  1375 + }
  1376 +
1349 1377 public void setBuildType(Integer buildType) {
1350 1378 this.buildType = buildType;
1351 1379 }
... ... @@ -2635,6 +2663,14 @@
2635 2663  
2636 2664 public void setbCGAndHBVVaccinationDosage(String bCGAndHBVVaccinationDosage) {
2637 2665 this.bCGAndHBVVaccinationDosage = bCGAndHBVVaccinationDosage;
  2666 + }
  2667 +
  2668 + public Integer getHearScrResult() {
  2669 + return hearScrResult;
  2670 + }
  2671 +
  2672 + public void setHearScrResult(Integer hearScrResult) {
  2673 + this.hearScrResult = hearScrResult;
2638 2674 }
2639 2675  
2640 2676 public String getHbvInjectUserName() {
platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java View file @ 27066b5
... ... @@ -143,7 +143,7 @@
143 143 /**
144 144 * @auther HuJiaqi
145 145 * @createTime 2016年12月05日 18时25分
146   - * @discription 听力是否筛查
  146 + * @discription 听力是否筛查（20210122 张洁滦平需求，听力是否筛查 就是 耳声发射，后台不用动前端该名称即可。）
147 147 */
148 148 private Integer isUNHS;
149 149  
... ... @@ -159,6 +159,7 @@
159 159 //听性脑干（1通过/2未通过）
160 160 private Integer txng;
161 161 // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
  162 + // "txngState":1 （20210122 张洁滦平需求 新增 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过）
162 163 private Map<String,Object> txngNew;
163 164  
164 165 //耳聋基因（1通过/2未通过）
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java View file @ 27066b5
... ... @@ -90,6 +90,7 @@
90 90 model.setName(lisRequest.getName());
91 91 model.setBhnum(lisRequest.getBhnum());
92 92 model.setPhone(lisRequest.getPhone());
  93 + model.setCardNo(lisRequest.getCardNo());
93 94 model.setSex(lisRequest.getSex());
94 95 model.setTitle(lisRequest.getTitle());
95 96 model.setType(lisRequest.getType());
... ... @@ -131,7 +132,7 @@
131 132 * @param sortType 排序类型(1,根据日期分类;2,根据检查项目分类)
132 133 * @param phone 手机号码
133 134 * @param cardNo 身份证号码
134   - * @param perType 2-儿童
  135 + * @param perType 1默认孕妇 、2-儿童、3以前指定了意见医院 、4 20210121新增婚检使用
135 136 * @param sINCard 儿童社保卡
136 137 * @return
137 138 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 27066b5
... ... @@ -1290,6 +1290,8 @@
1290 1290 private BabyModel getBabyModel(BabyBookbuildingAddRequest b, boolean isAdd, Integer userId, String hospitalId) {
1291 1291 // hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
1292 1292 BabyModel bm = new BabyModel();
  1293 + bm.setNextDate(DateUtil.parseYMD(b.getNextDate()));
  1294 + bm.setYlSelect(b.getYlSelect());
1293 1295 //遵化定制 路北辖区状态
1294 1296 bm.setZhlbxqState(b.getZhlbxqState());
1295 1297 bm.setKouqNew(b.getKouqNew());
... ... @@ -1652,6 +1654,9 @@
1652 1654 if (models != null && models.size() > 0) {
1653 1655 BabyModel model = models.get(0);
1654 1656 result = getBabyBuildResult(model);
  1657 + result.setYlSelect(model.getYlSelect());
  1658 + result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
  1659 +
1655 1660 result.setZhlbxqState(model.getZhlbxqState());
1656 1661 result.setKouqNew(model.getKouqNew());
1657 1662 result.setTxngNew(model.getTxngNew());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 27066b5
... ... @@ -190,8 +190,8 @@
190 190 List <BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
191 191 for (BabyModel b: babyModels) {//如果出院小结前有多个儿童档案都更新，后就无法控制了
192 192 BabyModel babyModel = setBabyModel(dabm, b);
193   - babyModel.setTxngNew(dabm.getTxngNew());
194   - babyModel.setKouqNew(dabm.getKouqNew());
  193 +// babyModel.setTxngNew(dabm.getTxngNew());
  194 +// babyModel.setKouqNew(dabm.getKouqNew());
195 195 if(babyModel !=null && StringUtils.isNotBlank(babyModel.getId())){
196 196 babyBookbuildingService.updateBabyBuild(babyModel,babyModel.getId());
197 197 }
198 198  
199 199  
200 200  
... ... @@ -208,14 +208,22 @@
208 208  
209 209 private BabyModel setBabyModel(DischargeAbstractBabyModel dabm, BabyModel babyModel) {
210 210  
211   - if(babyModel.getEsfs() == null && dabm.getEsfs()!=null){//耳声发射（1通过/2未通过）
  211 + /* if(babyModel.getEsfs() == null && dabm.getEsfs()!=null){//耳声发射（1通过/2未通过）
212 212 babyModel.setEsfs(dabm.getEsfs());
  213 + }*/
  214 + if(babyModel.getIsUNHS() == null && dabm.getIsUNHS()!=null){//听力是否筛查== 耳声发射,以前的耳声发射不要了
  215 + babyModel.setIsUNHS(dabm.getIsUNHS());
213 216 }
  217 + if(babyModel.getHearScrResult() == null && dabm.getHearScrResult()!=null){//听筛结果
  218 + babyModel.setHearScrResult(dabm.getHearScrResult());
  219 + }
  220 +
214 221 if(babyModel.getTxng() == null && dabm.getTxng()!=null){//听性脑干（1通过/2未通过）
215 222 babyModel.setTxng(dabm.getTxng());
216 223 }
217   -
218   - if(babyModel.getTxngNew() == null && dabm.getTxngNew()!=null){// 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
  224 + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)不在使用
  225 + // "txngState":1 （20210122 张洁滦平需求 新增 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过）
  226 + if(babyModel.getTxngNew() == null && dabm.getTxngNew()!=null){
219 227 babyModel.setTxngNew(dabm.getTxngNew());
220 228 }
221 229  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 27066b5
... ... @@ -85,7 +85,7 @@
85 85 *
86 86 * @param vcCardNo 就诊卡号
87 87 * @param sortType 排序类型(1,根据日期分类;2,根据检查项目分类)
88   - * @param perType 2-儿童，其他是孕妇
  88 + * @param perType 1默认孕妇 、2-儿童、3以前指定了意见医院 、4 20210121新增婚检使用
89 89 * @return
90 90 */
91 91 public BaseResponse getLisAndRisData(String vcCardNo,String sINCard, String phone, String cardNo, Integer sortType, int perType,String userName, Integer userId) {
... ... @@ -229,7 +229,7 @@
229 229 * @param phone 手机号码
230 230 * @param hospitalId 用户ID
231 231 * @param cardNo 身份证号码
232   - * @param perType 2-儿童
  232 + * @param perType 1默认孕妇 、2-儿童、3以前指定了意见医院 、4 20210121新增婚检使用
233 233 * @return
234 234 */
235 235 public List<CheckResponse> queryLisCheckList(String vcCardNo,String sINCard, String phone, String hospitalId, String cardNo, int perType,String userName) {
... ... @@ -261,6 +261,10 @@
261 261 else if (perType == 3)
262 262 {
263 263 lises = queryLisWhfyData(vcCardNo, cardNo,model);
  264 + }else if (perType == 4)//婚检查询方式
  265 + {
  266 + model.setHospitalId(hospitalId);
  267 + lises = queryLisHJData(vcCardNo, cardNo,model);
264 268 }
265 269 else {
266 270  
... ... @@ -503,6 +507,38 @@
503 507 }
504 508 else
505 509 {
  510 + if (StringUtils.isNotEmpty(vcCardNo))
  511 + {
  512 + model.setVcCardNo(vcCardNo);
  513 + }
  514 + lises = lisService.queryLisDataByModel(model);
  515 + if (CollectionUtils.isNotEmpty(lises)) {
  516 + reportModelList.addAll(lises);
  517 + }
  518 + }
  519 + }
  520 + return reportModelList;
  521 +
  522 + }
  523 +
  524 + /**
  525 + * 婚检查询lis检查数据，条件是身份证、就诊卡
  526 + * @param vcCardNo
  527 + * @param cardNo
  528 + * @param model
  529 + * @return
  530 + */
  531 + private List<LisReportModel> queryLisHJData(String vcCardNo, String cardNo,LisReportQuery model) {
  532 + List<LisReportModel> reportModelList = new ArrayList<>();
  533 + //通过就诊卡号和医院id查询到医院下面的lis记录
  534 + if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(cardNo)) {
  535 + if (StringUtils.isNotEmpty(cardNo)) {
  536 + model.setCardNo(cardNo);
  537 + }
  538 + List<LisReportModel> lises = lisService.queryLisDataByModel(model);
  539 + if (CollectionUtils.isNotEmpty(lises)) {
  540 + reportModelList.addAll(lises);
  541 + } else{
506 542 if (StringUtils.isNotEmpty(vcCardNo))
507 543 {
508 544 model.setVcCardNo(vcCardNo);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 27066b5
... ... @@ -5234,6 +5234,8 @@
5234 5234 result.setPatientSerResults(patientSerResults);
5235 5235  
5236 5236 result = result.convertToResult(model);
  5237 + result.setYlSelect(model.getYlSelect());
  5238 + result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
5237 5239 result.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId()));//民族
5238 5240 result.setEncoded(model.getEncoded());
5239 5241 result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ 27066b5
... ... @@ -12,6 +12,12 @@
12 12 */
13 13 @Form
14 14 public class BabyBookbuildingAddRequest {
  15 +
  16 + //月龄下拉框
  17 + private String ylSelect;
  18 + //下次预约
  19 + private String nextDate;
  20 +
15 21 /***********母亲基本信息***********/
16 22 // 儿童高危因素标记
17 23 private List<String> babyHighRiskReason;
... ... @@ -436,6 +442,22 @@
436 442 return yn;
437 443 }
438 444  
  445 + public String getYlSelect() {
  446 + return ylSelect;
  447 + }
  448 +
  449 + public void setYlSelect(String ylSelect) {
  450 + this.ylSelect = ylSelect;
  451 + }
  452 +
  453 + public String getNextDate() {
  454 + return nextDate;
  455 + }
  456 +
  457 + public void setNextDate(String nextDate) {
  458 + this.nextDate = nextDate;
  459 + }
  460 +
439 461 public void setYn(Integer yn) {
440 462 this.yn = yn;
441 463 }
442 464  
... ... @@ -1340,10 +1362,10 @@
1340 1362 this.highRisk = highRisk;
1341 1363 }
1342 1364  
  1365 +
1343 1366 public String getVipEndTime() {
1344 1367 return vipEndTime;
1345 1368 }
1346   -
1347 1369 public String getZhlbxqState() {
1348 1370 return zhlbxqState;
1349 1371 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java View file @ 27066b5
... ... @@ -206,7 +206,7 @@
206 206 /**
207 207 * @auther HuJiaqi
208 208 * @createTime 2016年12月05日 18时25分
209   - * @discription 听力是否筛查
  209 + * @discription 听力是否筛查（20210122 张洁滦平需求，听力是否筛查 就是 耳声发射，后台不用动前端该名称即可。）
210 210 */
211 211 private Integer isUNHS;
212 212 /**
213 213  
... ... @@ -220,7 +220,9 @@
220 220 //听性脑干（1通过/2未通过）
221 221 private Integer txng;
222 222 // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
  223 + // "txngState":1 （20210122 张洁滦平需求 新增 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过）
223 224 private Map txngNew;
  225 +
224 226 //耳聋基因（1通过/2未通过）
225 227 private Integer eljy;
226 228 //口腔（1通过/2未通过）
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java View file @ 27066b5
... ... @@ -18,6 +18,7 @@
18 18 private String type;
19 19 // 就诊卡号
20 20 private String vcCardNo;
  21 + private String cardNo;
21 22 // 患者姓名
22 23 private String name;
23 24 // 住院号
... ... @@ -52,6 +53,14 @@
52 53  
53 54 //检验项集合
54 55 private List<LisReportItemModel> items;
  56 +
  57 + public String getCardNo() {
  58 + return cardNo;
  59 + }
  60 +
  61 + public void setCardNo(String cardNo) {
  62 + this.cardNo = cardNo;
  63 + }
55 64  
56 65 public Integer getStatus() {
57 66 return status;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ 27066b5
... ... @@ -8,6 +8,12 @@
8 8 * Created by lqy on 2016/6/17.
9 9 */
10 10 public class BabyBuildResult {
  11 + //月龄下拉框
  12 + private String ylSelect;
  13 + //下次预约
  14 + private String nextDate;
  15 +
  16 +
11 17 // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
12 18 private Map<String,Object> txngNew;
13 19 //修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____
... ... @@ -474,6 +480,21 @@
474 480 this.mHighRiskReason = mHighRiskReason;
475 481 }
476 482  
  483 + public String getYlSelect() {
  484 + return ylSelect;
  485 + }
  486 +
  487 + public void setYlSelect(String ylSelect) {
  488 + this.ylSelect = ylSelect;
  489 + }
  490 +
  491 + public String getNextDate() {
  492 + return nextDate;
  493 + }
  494 +
  495 + public void setNextDate(String nextDate) {
  496 + this.nextDate = nextDate;
  497 + }
477 498  
478 499 public String getFileCode() {
479 500 return fileCode;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java View file @ 27066b5
... ... @@ -22,6 +22,12 @@
22 22 * Created by lqy on 2016/6/17.
23 23 */
24 24 public class BabyPageResult implements IBasicResultConvert<BabyPageResult,BabyModel> {
  25 + //月龄下拉框
  26 + private String ylSelect;
  27 + //下次预约
  28 + private String nextDate;
  29 +
  30 +
25 31 // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
26 32 private Map<String,Object> txngNew;
27 33 //修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____
... ... @@ -403,6 +409,22 @@
403 409 this.hospitalId = hospitalId;
404 410 }
405 411  
  412 + public String getYlSelect() {
  413 + return ylSelect;
  414 + }
  415 +
  416 + public void setYlSelect(String ylSelect) {
  417 + this.ylSelect = ylSelect;
  418 + }
  419 +
  420 + public String getNextDate() {
  421 + return nextDate;
  422 + }
  423 +
  424 + public void setNextDate(String nextDate) {
  425 + this.nextDate = nextDate;
  426 + }
  427 +
406 428 public String getFileCode() {
407 429 return fileCode;
408 430 }
... ... @@ -1267,6 +1289,7 @@
1267 1289 setZhlbxqState(destModel.getZhlbxqState());
1268 1290 setTxngNew(destModel.getTxngNew());
1269 1291 setKouqNew(destModel.getKouqNew());
  1292 +
1270 1293  
1271 1294 /*滦平 start */
1272 1295 setEsfs(destModel.getEsfs());