jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 20c883ec8212d92faa6c4e1d4cf4aeeb3d6b0c9a

Authored by jiangjiazhi
1 parent 9f2c5f6466
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

分娩作废产检劵

Showing 1 changed file with 18 additions and 47 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java View file @ 20c883e
... ... @@ -97,38 +97,33 @@
97 97 }
98 98  
99 99 public void deleteSieve(String parentId, String hospitalId, Date lastMenses) {
100   -
101   -// int days = DateUtil.daysBetween(lastMenses, new Date());
102   - //判断是否在区间
103   -// if (days >= 108 && days <= 146) {
104   - SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
105   - sieveApplyOrderQuery.setParentId(parentId);
106   - sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
107   - sieveApplyOrderQuery.setHospitalId(hospitalId);
108   - List<SieveApplyOrderModel> list = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
109   - if (CollectionUtils.isEmpty(list)) {
110   - //做分娩的时候需要删除产筛数据
111   - SieveQuery sieveQuery = new SieveQuery();
112   - sieveQuery.setParentId(parentId);
113   - sieveQuery.setYn(YnEnums.YES.getId());
114   - sieveQuery.setHospitalId(hospitalId);
115   - deleteById(sieveQuery);
  100 + if (StringUtils.isNotEmpty(parentId)) {
  101 + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
  102 + sieveApplyOrderQuery.setParentId(parentId);
  103 + sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
  104 + sieveApplyOrderQuery.setHospitalId(hospitalId);
  105 + List<SieveApplyOrderModel> list = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
  106 + if (CollectionUtils.isEmpty(list)) {
  107 + //做分娩的时候需要删除产筛数据
  108 + SieveQuery sieveQuery = new SieveQuery();
  109 + sieveQuery.setParentId(parentId);
  110 + sieveQuery.setYn(YnEnums.YES.getId());
  111 + sieveQuery.setHospitalId(hospitalId);
  112 + deleteById(sieveQuery);
  113 + }
116 114 }
117   -// }
118 115 }
119 116  
120 117 /**
121   - *
122 118 * 修正产筛order
123   - *
124 119 */
125   - public void correctSieveOrder(){
  120 + public void correctSieveOrder() {
126 121 SieveQuery sieveQuery = new SieveQuery();
127 122 sieveQuery.setYn(YnEnums.YES.getId());
128 123 sieveQuery.setStatus(SieveStatusEnums.O.getId());
129   - List<SieveModel> modelList= queryList(sieveQuery);
130   - if(CollectionUtils.isNotEmpty(modelList)){
131   - for(SieveModel sieveModel:modelList){
  124 + List<SieveModel> modelList = queryList(sieveQuery);
  125 + if (CollectionUtils.isNotEmpty(modelList)) {
  126 + for (SieveModel sieveModel : modelList) {
132 127 handOrder(sieveModel);
133 128 updateOneChanQianDiaSieve(sieveModel);
134 129 }
... ... @@ -136,7 +131,6 @@
136 131 }
137 132  
138 133 public static void handOrder(SieveModel sieveModel) {
139   -
140 134 int days = DateUtil.getDays(sieveModel.getLastMenses(), new Date());
141 135 int order = 100;
142 136 if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O.getId()) && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) {
... ... @@ -149,29 +143,6 @@
149 143 order = 4;
150 144 }
151 145 sieveModel.setOrder(order);
152   - }
153   -
154   - public static void main(String[] args) {
155   - new Thread(){
156   - @Override
157   - public void run() {
158   - SieveModel sieveModel = new SieveModel();
159   - sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-15"));
160   - sieveModel.setStatus(1);
161   - handOrder(sieveModel);
162   - System.out.print("1:"+sieveModel.getOrder());
163   - }
164   - }.start();
165   - new Thread(){
166   - @Override
167   - public void run() {
168   - SieveModel sieveModel = new SieveModel();
169   - sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-1"));
170   - sieveModel.setStatus(1);
171   - handOrder(sieveModel);
172   - System.out.print("2:"+sieveModel.getOrder());
173   - }
174   - }.start();
175 146 }
176 147 }