jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit bdc7366ee10fe8e87227f0cf4867b89c822921e1

Authored by Administrator
1 parent 5dceabe813
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 31 additions and 19 deletions

platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml View file @ bdc7366
... ... @@ -138,6 +138,9 @@
138 138 lyms_folvite_Info f ON p.folvite_id = f.id
139 139 <where>
140 140 1=1
  141 + <if test="yn != null">
  142 + and p.yn=#{yn}
  143 + </if>
141 144 <if test="queryNo !=null and queryNo != ''">
142 145 and f.name =#{queryNo} or f.card_no=#{queryNo} or f.phone=#{queryNo}
143 146 </if>
... ... @@ -168,6 +171,9 @@
168 171 lyms_folvite_Info f ON p.folvite_id = f.id
169 172 <where>
170 173 1=1
  174 + <if test="yn != null">
  175 + and p.yn=#{yn}
  176 + </if>
171 177 <if test="queryNo !=null and queryNo != ''">
172 178 and f.name =#{queryNo} or f.card_no=#{queryNo} or f.phone=#{queryNo}
173 179 </if>
... ... @@ -185,7 +191,6 @@
185 191 </if>
186 192 </where>
187 193 </select>
188   -
189 194  
190 195 <select id="queryFolviteListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery"
191 196 resultType="java.lang.Integer">
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml View file @ bdc7366
... ... @@ -7,6 +7,7 @@
7 7 <result column="folvite_id" property="folviteId"/>
8 8 <result column="receive_number" property="receiveNumber"/>
9 9 <result column="receive_week" property="receiveWeek"/>
  10 + <result column="receive_week" property="receiveWeek"/>
10 11 <result column="highrisk" property="highrisk"/>
11 12 <result column="provide_unit" property="provideUnit"/>
12 13 <result column="issuer" property="issuer"/>
... ... @@ -69,7 +70,7 @@
69 70 <where>
70 71 1=1
71 72 <if test="yn != null">
72   - and yn=#{yn}
  73 + and p.yn=#{yn}
73 74 </if>
74 75 <if test="queryNo != null and queryNo != ''">
75 76 and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
... ... @@ -107,7 +108,7 @@
107 108 <where>
108 109 1=1
109 110 <if test="yn != null">
110   - and yn=#{yn}
  111 + and p.yn=#{yn}
111 112 </if>
112 113 <if test="queryNo != null and queryNo != ''">
113 114 and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
... ... @@ -131,7 +132,6 @@
131 132 GROUP BY p.folvite_id
132 133 ) t
133 134  
134   -
135 135 </select>
136 136  
137 137 <select id="queyFolviteReceiveCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
... ... @@ -146,6 +146,11 @@
146 146 <if test="folviteId != null and folviteId != ''">
147 147 and folvite_id=#{folviteId}
148 148 </if>
  149 + <if test="yn != null">
  150 + and yn=#{yn}
  151 + </if>
  152 +
  153 +
149 154 </where>
150 155  
151 156  
... ... @@ -196,7 +201,7 @@
196 201 <if test="endPregnancy != null ">
197 202 end_pregnancy=#{endPregnancy,jdbcType=INTEGER},
198 203 </if>
199   - <if test="yn ! = null">
  204 + <if test="yn != null">
200 205 yn=#{yn}
201 206 </if>
202 207  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java View file @ bdc7366
... ... @@ -76,7 +76,7 @@
76 76 * @param id
77 77 * @return
78 78 */
79   - @RequestMapping(value = "queryFolviteOne/{id}", method = RequestMethod.GET)
  79 + @RequestMapping(value = "/queryFolviteOne/{id}", method = RequestMethod.GET)
80 80 @ResponseBody
81 81 @TokenRequired
82 82 public BaseResponse queryFolviteOne(@PathVariable("id") String id) {
... ... @@ -92,7 +92,7 @@
92 92 * @param request
93 93 * @return
94 94 */
95   - @RequestMapping(value = "saveOrUpdateProvideFolvite", method = RequestMethod.POST)
  95 + @RequestMapping(value = "/saveOrUpdateProvideFolvite", method = RequestMethod.POST)
96 96 @ResponseBody
97 97 @TokenRequired
98 98 public BaseResponse saveProvideFolvite(@Valid @RequestBody FolviteReceiveRecordModel receiveModel, HttpServletRequest request) {
... ... @@ -107,7 +107,7 @@
107 107 * @param request
108 108 * @return
109 109 */
110   - @RequestMapping(value = "queryOneProvide/{id}", method = RequestMethod.GET)
  110 + @RequestMapping(value = "/queryOneProvide/{id}", method = RequestMethod.GET)
111 111 @ResponseBody
112 112 @TokenRequired
113 113 public BaseResponse queryOneProvide(@PathVariable("id") String id, HttpServletRequest request) {
... ... @@ -126,7 +126,7 @@
126 126 @TokenRequired
127 127 public BaseResponse queryFolviteList(@Param("queryNo") String queryNo,
128 128 @Param("isconceive") Integer isconceive,
129   - @Param("receiveDate") String receiveDate,
  129 + @Param("receiveTime") String receiveTime,
130 130 @Param("drawTime") String drawTime,
131 131 @Param("page") Integer page,
132 132 @Param("limit") Integer limit) {
133 133  
... ... @@ -136,10 +136,10 @@
136 136 if (null != isconceive) {
137 137 query.setIsconceive(isconceive);
138 138 }
139   - if (StringUtils.isNotEmpty(receiveDate)) {
  139 + if (StringUtils.isNotEmpty(receiveTime)) {
140 140 try {
141   - query.setStartReceiveDate(DateUtil.getSNDate(receiveDate)[0]);
142   - query.setEndReceiveDate(DateUtil.getSNDate(receiveDate)[1]);
  141 + query.setStartReceiveDate(DateUtil.getSNDate(receiveTime)[0]);
  142 + query.setEndReceiveDate(DateUtil.getSNDate(receiveTime)[1]);
143 143 } catch (Exception e) {
144 144 e.printStackTrace();
145 145 }
... ... @@ -174,7 +174,7 @@
174 174 *
175 175 * @param queryNo
176 176 * @param hospitalId
177   - * @param receiveDate
  177 +
178 178 * @param highRisk
179 179 * @param page
180 180 * @param limit
... ... @@ -185,7 +185,7 @@
185 185 @TokenRequired
186 186 public BaseResponse queryFolviteRecord(@Param("queryNo") String queryNo,
187 187 @Param("hospitalId") String hospitalId,
188   - @Param("receiveDate") String receiveDate,
  188 + @Param("receiveTime") String receiveTime,
189 189 @Param("highRisk") String highRisk,
190 190 @Param("page") Integer page,
191 191 @Param("limit") Integer limit) {
192 192  
... ... @@ -197,10 +197,10 @@
197 197 if (StringUtils.isNotEmpty(hospitalId)) {
198 198 query.setHospitalId(hospitalId);
199 199 }
200   - if (StringUtils.isNotEmpty(receiveDate)) {
  200 + if (StringUtils.isNotEmpty(receiveTime)) {
201 201 try {
202   - query.setStartReceiveDate(DateUtil.getSNDate(receiveDate)[0]);
203   - query.setEndReceiveDate(DateUtil.getSNDate(receiveDate)[1]);
  202 + query.setStartReceiveDate(DateUtil.getSNDate(receiveTime)[0]);
  203 + query.setEndReceiveDate(DateUtil.getSNDate(receiveTime)[1]);
204 204 } catch (Exception e) {
205 205 e.printStackTrace();
206 206 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java View file @ bdc7366
... ... @@ -100,6 +100,7 @@
100 100 }
101 101 FolviteRecordQuery recordQuery = new FolviteRecordQuery();
102 102 recordQuery.setFolviteId(queryOne.getId());
  103 + recordQuery.setYn(YnEnums.YES.getId());
103 104 recordQuery.setSort("receive_date asc");
104 105 List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
105 106 if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
... ... @@ -171,7 +172,7 @@
171 172 BeanUtils.copyProperties(folviteRecordModel, folviteResult);
172 173 folviteResult.setNationalityStr(getBasicConfig(folviteRecordModel.getNationality()));
173 174 folviteResult.setNationStr(getBasicConfig(folviteRecordModel.getNation()));
174   - folviteResult.setMaritalStatusStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getMaritalStatusStr(), basicConfigService));
  175 + folviteResult.setMaritalStatusStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getMaritalStatus(), basicConfigService));
175 176 folviteResult.setCertificateTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getCertificateType(), basicConfigService));
176 177 folviteResult.setCensusTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteResult.getCensusType(), basicConfigService));
177 178 folviteResult.setLiveTypeStr(FunvCommonUtil.getBaseicConfigByid(folviteRecordModel.getLiveType(), basicConfigService));
... ... @@ -180,7 +181,7 @@
180 181 folviteResult.setUserNameStr(usersService.getUsers(Integer.valueOf(folviteRecordModel.getOperationDoctor())).getName());
181 182 folviteResult.setHabitationAddressStr(CommonsHelper.getResidence(folviteRecordModel.getHabitationProvince(), folviteRecordModel.getHabitationCity(),
182 183 folviteRecordModel.getHabitationArea(), folviteRecordModel.getHabitationCountry(), folviteRecordModel.getHabitationAddress(), basicConfigService));
183   - folviteResult.setHabitationAddressStr(CommonsHelper.getResidence(folviteRecordModel.getDomicileProvince(), folviteRecordModel.getDomicileCity(),
  184 + folviteResult.setDomicileAddressStr(CommonsHelper.getResidence(folviteRecordModel.getDomicileProvince(), folviteRecordModel.getDomicileCity(),
184 185 folviteRecordModel.getDomicileArea(), folviteRecordModel.getDomicileCountry(), folviteRecordModel.getDomicileAddress(), basicConfigService));
185 186 String hospital = "";
186 187 if (org.apache.commons.lang.StringUtils.isNotEmpty(folviteRecordModel.getHospitalId())) {
... ... @@ -287,6 +288,7 @@
287 288 }
288 289 FolviteRecordQuery recordQuery = new FolviteRecordQuery();
289 290 recordQuery.setFolviteId(queryOne.getId());
  291 + recordQuery.setYn(YnEnums.YES.getId());
290 292 recordQuery.setSort("receive_date asc");
291 293 List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
292 294 if (CollectionUtils.isNotEmpty(folviteRecordModels)) {