jiangjiazhi / regional-platform

Commit 0e3a955437f500ab0002464ffdbbcb9d4f08551b

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 118 additions and 4 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdEnums.java
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java

...	...	@@ -23,7 +23,7 @@
23	23	FOURYEARSOLD(48, "4岁"),
24	24	FIVEYEARSOLD(60, "5岁"),
25	25	SIXYEARSOLD(72, "6岁"),
26		- D(73, "7岁");
	26	+ D(73, ">7岁");
27	27	private Integer id;
28	28	private String name;
29	29

...	...	@@ -37,6 +37,28 @@
37	37
38	38	public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
39	39
	40	+ /**
	41	+ * 通过时间生成序号
	42	+ * 20200721003
	43	+ * @param equipmentNo 2
	44	+ * @Author: 武涛涛
	45	+ * @Date: 2020/7/21 15:13
	46	+ */
	47	+ public static String getDateNumber( String equipmentNo){
	48	+ String newEquipmentNo = "001";
	49	+ if(equipmentNo != null && !equipmentNo.isEmpty()){
	50	+ int newEquipment = Integer.parseInt(equipmentNo) + 1;
	51	+ newEquipmentNo = String.format(DateUtil.getymd6() + "%03d", newEquipment);
	52	+ }
	53	+ return newEquipmentNo;
	54	+ }
	55	+
	56	+ public static void main(String[] args) {
	57	+
	58	+ String dateNumber = getDateNumber("002");
	59	+ String substring = dateNumber.substring(8, dateNumber.length());
	60	+ System.out.println(substring);
	61	+ }
40	62	public static String getymd() {
41	63	return y_m_d.format(new Date());
42	64	}
43	65
...	...	@@ -1641,14 +1663,14 @@
1641	1663	return getYmdDate(calendar.getTime());
1642	1664	}
1643	1665
1644		- public static void main(String[] args) {
	1666	+ /* public static void main(String[] args) {
1645	1667
1646	1668	Date bir = parseYMD("1990-03-07");
1647	1669	Date bir1 = parseYMD("2019-03-08");
1648	1670	int i = DateUtil.getAge(bir, bir1);
1649	1671	System.out.println(i);
1650	1672
1651		- }
	1673	+ }*/
1652	1674
1653	1675	}

...	...	@@ -31,6 +31,11 @@
31	31	// 编号
32	32	private String sNumber;
33	33
	34	+ // 编码唯一，通过编码获取档案信息，编码格式20200721001
	35	+ private String encoded;
	36	+ //新生儿民族Id
	37	+ private String bnationId;
	38	+
34	39	// 0未结案 1结案
35	40	private Integer endCase;
36	41	//转归 1.痊愈 2.好转 3.无变化转诊 4.加重转诊 5.死亡
...	...	@@ -1698,6 +1703,22 @@
1698	1703
1699	1704	public void setNevus(String nevus) {
1700	1705	this.nevus = nevus;
	1706	+ }
	1707	+
	1708	+ public String getEncoded() {
	1709	+ return encoded;
	1710	+ }
	1711	+
	1712	+ public void setEncoded(String encoded) {
	1713	+ this.encoded = encoded;
	1714	+ }
	1715	+
	1716	+ public String getBnationId() {
	1717	+ return bnationId;
	1718	+ }
	1719	+
	1720	+ public void setBnationId(String bnationId) {
	1721	+ this.bnationId = bnationId;
1701	1722	}
1702	1723
1703	1724	public String getPigment() {

...	...	@@ -19,6 +19,8 @@
19	19	* @author Administrator
20	20	*/
21	21	public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
	22	+ // 编码唯一，通过编码获取档案信息，编码格式20200721001
	23	+ private boolean encoded;
22	24
23	25	private String id;
24	26
...	...	@@ -742,6 +744,14 @@
742	744
743	745	public void setLastHighRisk(Integer lastHighRisk) {
744	746	this.lastHighRisk = lastHighRisk;
	747	+ }
	748	+
	749	+ public boolean isEncoded() {
	750	+ return encoded;
	751	+ }
	752	+
	753	+ public void setEncoded(boolean encoded) {
	754	+ this.encoded = encoded;
745	755	}
746	756
747	757	public Integer getWeakSon() {

...	...	@@ -9,6 +9,7 @@
9	9	import com.lyms.hospitalapi.v2.HisService;
10	10	import com.lyms.platform.beans.AddressBean;
11	11	import com.lyms.platform.beans.MsgRequest;
	12	+import com.lyms.platform.biz.dal.IBabyBookBuildingDao;
12	13	import com.lyms.platform.biz.service.*;
13	14	import com.lyms.platform.common.constants.ErrorCodeConstants;
14	15	import com.lyms.platform.common.dao.operator.MongoQuery;
...	...	@@ -1073,7 +1074,8 @@
1073	1074	patient.setType(3);
1074	1075	return patient;
1075	1076	}
1076		-
	1077	+ @Autowired
	1078	+ private IBabyBookBuildingDao babyBookBuildingDao;
1077	1079	/**
1078	1080	* 封装保存对象
1079	1081	*
...	...	@@ -1089,6 +1091,10 @@
1089	1091	bm.setCreated(new Date());
1090	1092	}
1091	1093
	1094	+ //新生儿民族Id
	1095	+ bm.setEncoded(getEncodedUtil());// 编码
	1096	+ bm.setBnationId(b.getBnationId());//新生儿民族Id
	1097	+
1092	1098	bm.setLiveType(b.getLiveType());
1093	1099	bm.setFileCode(b.getFileCode());
1094	1100	bm.setBabyHighRiskReason(b.getBabyHighRiskReason());
...	...	@@ -1290,6 +1296,40 @@
1290	1296	bm.setBlNo(b.getBlNo());
1291	1297
1292	1298	return bm;
	1299	+ }
	1300	+
	1301	+ /**
	1302	+ * 编码生成
	1303	+ *
	1304	+ * 生成规则20200721后面加001以此累加
	1305	+ * 先获取已使用的累加序号，递增生成。
	1306	+ * 如果当天没有序号那就从当前时间+001开始
	1307	+ *
	1308	+ * @param
	1309	+ * @Author: 武涛涛
	1310	+ * @Date: 2020/7/21 16:07
	1311	+ */
	1312	+ private String getEncodedUtil() {
	1313	+ try {
	1314	+ BabyModelQuery babyQuery = new BabyModelQuery();
	1315	+ babyQuery.setYn(YnEnums.YES.getId());
	1316	+ babyQuery.setCreatedTimeStart(DateUtil.getDayFirstSecond(new Date()));
	1317	+ babyQuery.setCreatedTimeEnd(DateUtil.getDayLastSecond(new Date()));
	1318	+ babyQuery.setEncoded(true);
	1319	+ MongoQuery query = babyQuery.convertToQuery();
	1320	+ List<BabyModel> list = babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "created"));
	1321	+ if(CollectionUtils.isNotEmpty(list)){
	1322	+ BabyModel babyModel = list.get(0);
	1323	+ if(StringUtils.isNotEmpty(babyModel.getEncoded()) && babyModel.getEncoded().length()>8){
	1324	+ String encoded = babyModel.getEncoded().substring(8, babyModel.getEncoded().length());//20200721003
	1325	+ return DateUtil.getDateNumber(encoded);
	1326	+ }
	1327	+ }
	1328	+ return DateUtil.getDateNumber("");
	1329	+ } catch (Exception e) {
	1330	+ e.printStackTrace();
	1331	+ }
	1332	+ return null;
1293	1333	}
1294	1334
1295	1335	/**

...	...	@@ -130,6 +130,11 @@
130	130	private String homeCityId;
131	131	private String homeAreaId;
132	132	private String homeStreetId;
	133	+
	134	+ // 编码唯一，通过编码获取档案信息，编码格式20200721001
	135	+ private String encoded;
	136	+ //新生儿民族Id
	137	+ private String bnationId;
133	138	/**
134	139	* 1, "有效",0, "无效"
135	140	* 如果是孕妇分娩自动建档则无效，当完善时修改成有效
...	...	@@ -934,6 +939,22 @@
934	939
935	940	public String getHomeCityId() {
936	941	return homeCityId;
	942	+ }
	943	+
	944	+ public String getEncoded() {
	945	+ return encoded;
	946	+ }
	947	+
	948	+ public void setEncoded(String encoded) {
	949	+ this.encoded = encoded;
	950	+ }
	951	+
	952	+ public String getBnationId() {
	953	+ return bnationId;
	954	+ }
	955	+
	956	+ public void setBnationId(String bnationId) {
	957	+ this.bnationId = bnationId;
937	958	}
938	959
939	960	public void setHomeCityId(String homeCityId) {