jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1d0e6de31bc3d9141947498309edbb56dc810263

Authored by liquanyu
1 parent 99cea41d59
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

肌萎缩

Showing 6 changed files with 70 additions and 1 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterUsersMapper.java View file @ 1d0e6de
... ... @@ -7,6 +7,7 @@
7 7 import org.springframework.web.bind.annotation.RequestParam;
8 8  
9 9 import java.util.List;
  10 +import java.util.Map;
10 11  
11 12 public interface MasterUsersMapper {
12 13 public void addUsers(Users obj);
... ... @@ -39,5 +40,9 @@
39 40 void updateSeq(String yearStr);
40 41  
41 42 String getUsersByDept(String hospitalId);
  43 +
  44 + Map<String, String> getSmnSeq(String hospitalId);
  45 + void insertSmnSeq(Map<String,String> map);
  46 + void updateSmnSeq(Map<String,String> map);
42 47 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java View file @ 1d0e6de
... ... @@ -32,5 +32,7 @@
32 32 Long getBabySeq(String year);
33 33  
34 34 String getUsersByDept(String hospitalId);
  35 +
  36 + String getSmnSeq(String hospitalId);
35 37 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java View file @ 1d0e6de
... ... @@ -19,7 +19,9 @@
19 19 import org.springframework.beans.factory.annotation.Autowired;
20 20 import org.springframework.stereotype.Service;
21 21  
  22 +import java.util.HashMap;
22 23 import java.util.List;
  24 +import java.util.Map;
23 25  
24 26 @Service("usersServiceImpl1")
25 27 public class UsersServiceImpl extends DataAccessLayerService implements UsersService {
... ... @@ -130,6 +132,37 @@
130 132 @Override
131 133 public String getUsersByDept(String hospitalId) {
132 134 return usersMapper.getUsersByDept(hospitalId);
  135 + }
  136 +
  137 + @Override
  138 + public synchronized String getSmnSeq(String hospitalId) {
  139 +
  140 + String currentYear = DateUtil.getYearStr();
  141 + Map<String,String> map = usersMapper.getSmnSeq(hospitalId);
  142 + if (map != null && map.size() > 0)
  143 + {
  144 + String seq = map.get("seq");
  145 + if (!currentYear.equals(seq.substring(0,4)))
  146 + {
  147 + String seq1 = currentYear+"00001";
  148 + Map<String,String> dbMap = new HashMap<>();
  149 + dbMap.put("seq",seq1);
  150 + dbMap.put("hospital_id",hospitalId);
  151 + usersMapper.updateSmnSeq(dbMap);
  152 + return seq1;
  153 + }
  154 + Long seqNum = Long.parseLong(seq)+1;
  155 + String newSeq = String.valueOf(seqNum);
  156 + map.put("seq",newSeq);
  157 + usersMapper.updateSmnSeq(map);
  158 + return newSeq;
  159 + }
  160 + String seq = currentYear+"00001";
  161 + Map<String,String> dbMap = new HashMap<>();
  162 + dbMap.put("seq",seq);
  163 + dbMap.put("hospital_id",hospitalId);
  164 + usersMapper.insertSmnSeq(dbMap);
  165 + return seq;
133 166 }
134 167  
135 168  
platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml View file @ 1d0e6de
... ... @@ -368,5 +368,18 @@
368 368 d.`name` LIKE '%儿%'
369 369 LIMIT 1
370 370 </select>
  371 +
  372 + <select id="getSmnSeq" parameterType="string" resultType="map">
  373 + select seq from lyms_smn_seq where hospital_id=#{hospitalId}
  374 + </select>
  375 +
  376 + <insert id="insertSmnSeq" parameterType="map">
  377 + insert into lyms_smn_seq(hospital_id,seq) values (#{hospitalId},#{seq})
  378 + </insert>
  379 +
  380 + <update id="updateSmnSeq" parameterType="map">
  381 + update lyms_smn_seq set seq = #{seq} where hospital_id=#{hospitalId}
  382 + </update>
  383 +
371 384 </mapper>
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 1d0e6de
... ... @@ -1982,6 +1982,7 @@
1982 1982 // BigDecimal bg = new BigDecimal(1.0/30*a);
1983 1983 // double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
1984 1984 //
  1985 + System.out.println("211022199403243920".substring("211022199403243920".length() - 6));
1985 1986 System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.parseYMDHMS("2022-8-4 9:49:48")));
1986 1987 }
1987 1988  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java View file @ 1d0e6de
... ... @@ -14,6 +14,7 @@
14 14 import com.lyms.platform.operate.web.result.SmnResult;
15 15 import com.lyms.platform.operate.web.utils.CommonsHelper;
16 16 import com.lyms.platform.permission.service.OrganizationService;
  17 +import com.lyms.platform.permission.service.UsersService;
17 18 import com.lyms.platform.pojo.Patients;
18 19 import com.lyms.platform.pojo.SmnModel;
19 20 import com.lyms.platform.query.PatientsQuery;
... ... @@ -28,6 +29,7 @@
28 29 import org.springframework.stereotype.Component;
29 30  
30 31 import java.util.ArrayList;
  32 +import java.util.Arrays;
31 33 import java.util.Date;
32 34 import java.util.List;
33 35  
... ... @@ -46,6 +48,9 @@
46 48 @Autowired
47 49 private PatientsService patientsService;
48 50  
  51 + @Autowired
  52 + private UsersService usersService;
  53 +
49 54 public BaseResponse addSmn(SmnRequest param, Integer userId) {
50 55 String hospitalId = autoMatchFacade.getHospitalId(userId);
51 56  
... ... @@ -56,6 +61,7 @@
56 61 BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel));
57 62 param.setHospitalId(hospitalId);
58 63 param.setStatus(2);
  64 + param.setYbNum(smnModel.getCardNo().substring(smnModel.getCardNo().length() - 6)+usersService.getSmnSeq(hospitalId));
59 65 Query query1 = Query.query(Criteria.where("id").is(smnModel.getId()));
60 66 Update update = MongoConvertHelper
61 67 .convertToNativeUpdate(ReflectionUtils.getUpdateField(param));
... ... @@ -68,6 +74,7 @@
68 74 BeanUtils.copyProperties(patients,param);
69 75 param.setHospitalId(hospitalId);
70 76 param.setStatus(2);
  77 + param.setYbNum(patients.getCardNo().substring(patients.getCardNo().length() - 6)+usersService.getSmnSeq(hospitalId));
71 78 param.setCreated(new Date());
72 79 param.setPatientId(patients.getId());
73 80 param.setId(null);
... ... @@ -130,7 +137,15 @@
130 137  
131 138 if(param.getQueryType() == 1)
132 139 {
133   - query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
  140 + if ("2100001291".equals(hospitalId))
  141 + {
  142 + //承德市妇幼保健院 双桥区妇幼保健计划生育服务中心 营子区妇幼保健计划生育服务中心
  143 + query.addCriteria(Criteria.where("hospitalId").in(Arrays.asList("2100001291","2100001409","2100001414")));
  144 + }
  145 + else
  146 + {
  147 + query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
  148 + }
134 149 }
135 150 else if (param.getQueryType() == 3)
136 151 {