jiangjiazhi / regional-platform

Commit 7f9f5ecae8d91a3ef55181c9f21948b8780444b3

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 36 additions and 22 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/Archives.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java

...	...	@@ -440,16 +440,6 @@
440	440	//隆化- 是否全部模块上传省平台成功。0：失败。1：成功（有一个模块上传失败也是0）
441	441	private Integer isUploadingProvince;
442	442
443		- //接收List<String> ids
444		- private List<String> ids;
445		-
446		- public List<String> getIds() {
447		- return ids;
448		- }
449		-
450		- public void setIds(List<String> ids) {
451		- this.ids = ids;
452		- }
453	443
454	444	public Integer getIsUploadingProvince() {
455	445	return isUploadingProvince;

...	...	@@ -957,16 +957,26 @@
957	957	query.addCriteria(Criteria.where("id").in(ids));
958	958	List <PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class);
959	959	for (PreEugenicsBaseModel preEugenicsBaseModel : preEugenicsBaseModels) {
	960	+ //新增修改url
	961	+ String urladd=URL+"/m/antenatalUpload/uploadArchives";//新增上传
	962	+ String urlupdate=URL+"/m/antenatalUpload/updateArchives";//修改上传
960	963	//隆化- 村级区划接口文档需要,隶属单位村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227以后别的地区直接传值
961	964	preEugenicsBaseModel.setSubUnitsVillage("130825100227");
962		- //上传孕前档案基本信息4.1
963		- String result1=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadArchives"),
964		- lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY));
	965	+ //上传孕前档案基本信息4.1(新上传和修改)
	966	+ String result1="";
	967	+ if(StringUtils.isEmpty(preEugenicsBaseModel.getDocumentId())){
	968	+ result1=HttpClientUtil.doWebServicePost(urladd,
	969	+ lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,null));
	970	+ }else {
	971	+ result1=HttpClientUtil.doWebServicePost(urlupdate,
	972	+ lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,preEugenicsBaseModel.getDocumentId()));
	973	+ }
	974	+
965	975	if(StringUtils.isNotEmpty(result1)){
966	976	List<UploadResult> list1=JsonUtil.jsonToList(result1, UploadResult.class);
967		- //成功后返回的documentId后面上传都要用到
968		- String documentId=list1.get(0).getDocumentId();
969	977	if("0000".equals(list1.get(0).getCode())){
	978	+ //成功后返回的documentId后面上传都要用到
	979	+ String documentId=list1.get(0).getDocumentId();
970	980	Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
971	981	Update update1 = new Update().set("documentId", documentId)//上传成功后返回的id
972	982	.set("isUploadingYn.archives", 0);//成功
...	...	@@ -999,7 +1009,8 @@
999	1009	}
1000	1010	}
1001	1011	String result3 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGeneralSituation")
1002		- , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo(), KEY, documentId));
	1012	+ , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo()
	1013	+ , KEY, documentId));
1003	1014	if (StringUtils.isNotEmpty(result3)) {
1004	1015	List<UploadResult> list3 = JsonUtil.jsonToList(result3, UploadResult.class);
1005	1016	if ("0000".equals(list3.get(0).getCode())) {

...	...	@@ -44,8 +44,12 @@
44	44	private LhxfyService lhxfyService;
45	45
46	46	//上传孕前档案基本信息4.1
47		- public String uploadingProvinceArchives(PreEugenicsBaseModel baseModel,String key){
	47	+ public String uploadingProvinceArchives(PreEugenicsBaseModel baseModel,String key,String documentId){
48	48	Archives archives=new Archives();
	49	+ //修改时传入documentId
	50	+ if(StringUtils.isNotEmpty(documentId)){
	51	+ archives.setId(documentId);
	52	+ }
49	53	archives.setKey(key);// 上传需要的密钥
50	54	Users users = usersService.getUsers(Integer.parseInt(baseModel.getDoctor()));
51	55	archives.setDocName(users.getName());// 医师签名
...	...	@@ -156,7 +160,7 @@
156	160	archives.setMarriageTypeCode(null);// 婚姻状态01：初婚 02：再婚 03：复婚(系统没有具体选项)
157	161	archives.setFloatingCode(null);// 是否流动人口 1 是 2(系统没有具体选项)
158	162	archives.setPeriMarriageEducation("01");// 优生健康教育下拉选 01双方接受教育 02 男方接受教育 03 女方接受教育（系统没有字段必填默认01）
159		- archives.setIsPection(null);// 是否同步到婚检 1是 0否(系统没有具体选项)
	163	+ archives.setIsPection("0");// 是否同步到婚检 1是 0否(需求默认0)
160	164	archives.setHusbandWorkUnit(null);// 丈夫工作单位(系统没有具体选项)
161	165	archives.setHusbandResidentialCategory("01");//丈夫居住类 01 本地 02 非本地居住一年以 03 非本地居住一年以上（系统没有字段必填默认01）
162	166	archives.setWifeWorkUnit(null);// 妻子工作单位(系统没有具体选项)
...	...	@@ -918,7 +922,7 @@
918	922	physiqueCheck.setExistContent(null);// 不参加妇科/男科检查的原因(系统没有字段)
919	923	physiqueCheck.setPubicHairType(((List<Object>)baseInfo.get("yinmao")).get(0).toString().equals("0")?"01":"02");//阴毛 01：正常 02：异常
920	924	physiqueCheck.setPubicHair(((List<Object>)baseInfo.get("yinmao")).get(1).toString());// 阴毛异常详情
921		- physiqueCheck.setIsPection(null);// 数据是否同步到婚检1：是 2：否(系统没有字段)
	925	+ physiqueCheck.setIsPection("0");// 数据是否同步到婚检1：是 2：否(需求默认0)
922	926	physiqueCheck.setSexCheckOther(baseInfo.get("othermsg1").toString());// 其他
923	927	physiqueCheck.setSexCheckDate(baseInfo.get("fillDate").toString());// 检查日期
924	928	Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString()));

...	...	@@ -5,6 +5,7 @@
5	5	*/
6	6	public class Archives {
7	7
	8	+ private String id;//修改时使用的documentId
8	9	private String key; // 上传需要的密钥
9	10	private String docName; // 医师签名
10	11	private String fillTime; // 填写日期
...	...	@@ -68,6 +69,14 @@
68	69
69	70	public String getDocName() {
70	71	return docName;
	72	+ }
	73	+
	74	+ public String getId() {
	75	+ return id;
	76	+ }
	77	+
	78	+ public void setId(String id) {
	79	+ this.id = id;
71	80	}
72	81
73	82	public void setDocName(String docName) {

...	...	@@ -298,13 +298,13 @@
298	298	}
299	299	/**
300	300	* 河北省孕前上传数据
301		- * @param baseModel
	301	+ * @param ids
302	302	*/
303	303	@ResponseBody
304	304	@TokenRequired
305	305	@RequestMapping(value = "/uploadingProvince", method = RequestMethod.POST)
306		- public BaseResponse uploadingProvince(PreEugenicsBaseModel baseModel) {
307		- lhxfyService.uploadingProvince(baseModel.getIds());
	306	+ public BaseResponse uploadingProvince(@RequestBody List<String> ids) {
	307	+ lhxfyService.uploadingProvince(ids);
308	308	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
309	309	}
310	310